Projects >> jasmine-maven-plugin >>6f4c1e2fbad073969bb3622d8262604c4867bb87

Chunk
Conflicting content
	private JasmineResult executeSpecs(File runnerFile) throws MalformedURLException {
		WebDriver driver = createDriver();
		JasmineResult result = new SpecRunnerExecutor().execute(
<<<<<<< HEAD
				runnerFile.toURI().toURL(),
				new File(jasmineTargetDir, junitXmlReportFileName),
				browserVersion,
				timeout, debug, getLog(), format);
=======
			runnerFile.toURI().toURL(), 
			new File(jasmineTargetDir,junitXmlReportFileName), 
			driver, 
			timeout, debug, getLog(), format);
>>>>>>> d8ec1ab33ece19f7955aa3d2e953504f758df4b8
		return result;
	}
Solution content
	private JasmineResult executeSpecs(File runnerFile) throws MalformedURLException {
		WebDriver driver = createDriver();
		JasmineResult result = new SpecRunnerExecutor().execute(
			runnerFile.toURI().toURL(), 
			new File(jasmineTargetDir,junitXmlReportFileName), 
			driver, 
			timeout, debug, getLog(), format);
		return result;
	}
File
TestMojo.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable