Projects >> jbehave-web >>cd8861a94df8bb4449b2cacf1998ae7a13ab4a8d

Chunk
Conflicting content 
			try {
				outputStream.reset();
				storyContext.clearFailureCause();
<<<<<<< HEAD
                storyRunner.run(configuration, steps, storyParser.parseStory(storyContext.getInput()));
=======
                scenarioRunner.run(configuration, asList(steps), scenarioParser.parseStory(storyContext.getInput()));
>>>>>>> 16d9dce83610c0ea3710317617a29ac50aa83375
			} catch (Throwable e) {
				storyContext.runFailedFor(e);
			}
Solution content 
			try {
				outputStream.reset();
				storyContext.clearFailureCause();
                storyRunner.run(configuration, steps, storyParser.parseStory(storyContext.getInput()));
			} catch (Throwable e) {
				storyContext.runFailedFor(e);
			}
File
StoryController.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
			one(selenium).close();
			one(selenium).stop();
		}});
<<<<<<< HEAD
		CandidateSteps steps = new MySteps(selenium){
=======

		Steps steps = new MySteps(selenium) {
>>>>>>> 16d9dce83610c0ea3710317617a29ac50aa83375

			@Override
			protected ConditionRunner createConditionRunner(Selenium selenium) {
Solution content 
			one(selenium).close();
			one(selenium).stop();
		}});
		CandidateSteps steps = new MySteps(selenium){
			@Override
			protected ConditionRunner createConditionRunner(Selenium selenium) {
File
SeleniumPerScenarioStepsTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
			}
			
		};
<<<<<<< HEAD
        runner.run(configuration, asList(steps), parser.parseStory(input, path), true);
=======
        Story story = parser.parseStory(input, path);
        runner.run(configuration, asList((CandidateSteps)steps), story, true);
>>>>>>> 16d9dce83610c0ea3710317617a29ac50aa83375
	}
Solution content 
			}
			
		};
        runner.run(configuration, asList(steps), parser.parseStory(input, path), true);
	}
File
SeleniumPerScenarioStepsTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
			}

		};
<<<<<<< HEAD
        runner.run(configuration, asList(steps), parser.parseStory(input, path), true);
=======
        Story story = parser.parseStory(input, path);
        runner.run(configuration, asList((CandidateSteps)steps), story, true);
>>>>>>> 16d9dce83610c0ea3710317617a29ac50aa83375
	}
Solution content 
			}

		};
        runner.run(configuration, asList(steps), parser.parseStory(input, path), true);
	}
File
SeleniumPerStoryStepsTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable