Projects >> nuxeo >>d0d2992cf7bf9ebe7353b040a7c00acbb6017e60

Chunk
Conflicting content 
>>>>>>> 9cec30f06340d26b96c06b22945018679716e1d8

        return config;
    }

<<<<<<< HEAD
    protected abstract FreemarkerRenderingJob createJob(RenderingContext ctx) throws RenderingException;
=======
    protected abstract FreemarkerRenderingJob createJob(RenderingContext ctx)
            throws RenderingException;
    public RenderingResult process(RenderingContext ctx)
            throws RenderingException {
Solution content 
        return config;
    }

    protected abstract FreemarkerRenderingJob createJob(RenderingContext ctx)
            throws RenderingException;

    public RenderingResult process(RenderingContext ctx)
            throws RenderingException {
File
FreemarkerRenderingEngine.java
Developer's decision
Version 1
Kind of conflict
Method interface