Projects >> jbehave-core >>ad8c2469a593c12b113b345e4367ef971696be8f

Chunk
Conflicting content 
        Properties resources = new Properties();
        resources.setProperty("index", "ftl/jbehave-reports-index.ftl");
        resources.setProperty("decorated", "ftl/jbehave-report-decorated.ftl");
<<<<<<< HEAD
        resources.setProperty("nonDecorated", "ftl/jbehave-report-non-decorated.ftl");
=======
        resources.setProperty("non-decorated", "ftl/jbehave-report-non-decorated.ftl");
>>>>>>> 8a2e9cb9d06984c0748be629b2d48522f6a4a664
        resources.setProperty("decorateNonHtml", "true");
        resources.setProperty("renderedDirectory", "rendered");
        resources.setProperty("defaultFormats", "stats");
Solution content 
        Properties resources = new Properties();
        resources.setProperty("index", "ftl/jbehave-reports-index.ftl");
        resources.setProperty("decorated", "ftl/jbehave-report-decorated.ftl");
        resources.setProperty("nonDecorated", "ftl/jbehave-report-non-decorated.ftl");
        resources.setProperty("decorateNonHtml", "true");
        resources.setProperty("renderedDirectory", "rendered");
        resources.setProperty("defaultFormats", "stats");
File
FreemarkerReportRenderer.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    private List renderedReports(Map> reportFiles) {
        try {
            String decoratedTemplate = templateResource("decorated");
<<<<<<< HEAD
            String nonDecoratedTemplate = templateResource("nonDecorated");
=======
            String nonDecoratedTemplate = templateResource("non-decorated");
>>>>>>> 8a2e9cb9d06984c0748be629b2d48522f6a4a664
            String renderedDirectory = templateResource("renderedDirectory");
            boolean decorateNonHtml = Boolean.valueOf(templateResource("decorateNonHtml"));
            List reports = new ArrayList();
Solution content 
    private List renderedReports(Map> reportFiles) {
        try {
            String decoratedTemplate = templateResource("decorated");
            String nonDecoratedTemplate = templateResource("nonDecorated");
            String renderedDirectory = templateResource("renderedDirectory");
            boolean decorateNonHtml = Boolean.valueOf(templateResource("decorateNonHtml"));
            List reports = new ArrayList();
File
FreemarkerReportRenderer.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable