Projects >> jbehave-core >>5053281cdc77388fea163e7364cc85a5032bf605

Chunk
Conflicting content 
import org.jbehave.core.reporters.StoryReporterBuilder;
import org.jbehave.core.steps.SilentStepMonitor;
import org.jbehave.core.steps.ParameterConverters.DateConverter;
<<<<<<< HEAD
import org.jbehave.examples.trader.converters.TraderConverter;
import org.junit.Test;

@WithConfiguration(stepMonitor = SilentStepMonitor.class, 
        stepPatternParser = AnnotatedTraderStoryRunner.MyRegexPrefixCapturingPatternParser.class, 
        storyLoader = AnnotatedTraderStoryRunner.MyStoryLoader.class, 
        storyReporterBuilder = AnnotatedTraderStoryRunner.MyReportBuilder.class,
        parameterConverters = { AnnotatedTraderStoryRunner.MyDateConverter.class, AnnotatedTraderStoryRunner.MyTraderConverter.class })
=======
import org.junit.Test;

@WithConfiguration(stepMonitor = SilentStepMonitor.class, 
        storyLoader = AnnotatedTraderStoryRunner.MyStoryLoader.class, 
        parameterConverters = { AnnotatedTraderStoryRunner.MyDateConverter.class }, 
        stepPatternParser = AnnotatedTraderStoryRunner.MyRegexPrefixCapturingPatternParser.class, 
        storyReporterBuilder = AnnotatedTraderStoryRunner.MyReportBuilder.class)
>>>>>>> de13774b7037ddddb083922bac657d3bcf632e18
@WithCandidateSteps(candidateSteps = { TraderSteps.class })
public class AnnotatedTraderStoryRunner {
Solution content 
import org.jbehave.core.reporters.StoryReporterBuilder;
import org.jbehave.core.steps.SilentStepMonitor;
import org.jbehave.core.steps.ParameterConverters.DateConverter;
import org.jbehave.examples.trader.converters.TraderConverter;
import org.junit.Test;

@WithConfiguration(stepMonitor = SilentStepMonitor.class, 
        stepPatternParser = AnnotatedTraderStoryRunner.MyRegexPrefixCapturingPatternParser.class, 
        storyLoader = AnnotatedTraderStoryRunner.MyStoryLoader.class, 
        storyReporterBuilder = AnnotatedTraderStoryRunner.MyReportBuilder.class,
        parameterConverters = { AnnotatedTraderStoryRunner.MyDateConverter.class, AnnotatedTraderStoryRunner.MyTraderConverter.class })
@WithCandidateSteps(candidateSteps = { TraderSteps.class })
public class AnnotatedTraderStoryRunner {
File
AnnotatedTraderStoryRunner.java
Developer's decision
Version 1
Kind of conflict
Annotation
Import
Chunk
Conflicting content 
            super(new SimpleDateFormat("yyyy-MM-dd"));
        }
    }
<<<<<<< HEAD
    
    public static class MyTraderConverter extends TraderConverter {
        public MyTraderConverter(){
            super(TraderSteps.mockTradePersister());
        }
    }
=======
>>>>>>> de13774b7037ddddb083922bac657d3bcf632e18

}
Solution content 
            super(new SimpleDateFormat("yyyy-MM-dd"));
        }
    }
    
    public static class MyTraderConverter extends TraderConverter {
        public MyTraderConverter(){
            super(TraderSteps.mockTradePersister());
        }
    }

}
File
AnnotatedTraderStoryRunner.java
Developer's decision
Version 1
Kind of conflict
Class declaration