Projects >> cucumber-jvm >>93f56980572be2fa44e0684305d4c4cf28fae057

Chunk
Conflicting content 
package cucumber.runtime.clojure;

<<<<<<< HEAD
import clojure.lang.AFunction;
import clojure.lang.RT;
import cucumber.classpath.Classpath;
import cucumber.classpath.Consumer;
import cucumber.io.Resource;
import cucumber.runtime.*;
=======
>>>>>>> 0ec74215c6b4105412da4d85bafb67790b6bfbb2
import gherkin.formatter.model.Step;

import java.util.ArrayList;
Solution content 
package cucumber.runtime.clojure;

import clojure.lang.AFunction;
import clojure.lang.RT;
import cucumber.classpath.Classpath;
import cucumber.classpath.Consumer;
import cucumber.io.Resource;
import cucumber.runtime.Backend;
import cucumber.runtime.CucumberException;
import cucumber.runtime.StepDefinition;
import gherkin.formatter.model.Step;

import java.util.ArrayList;
File
ClojureBackend.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
package cucumber.runtime;

<<<<<<< HEAD
import cucumber.classpath.Classpath;
=======
import static java.util.Arrays.asList;
>>>>>>> 0ec74215c6b4105412da4d85bafb67790b6bfbb2
import gherkin.formatter.Argument;
import gherkin.formatter.model.Step;
Solution content 
package cucumber.runtime;

import cucumber.classpath.Classpath;
import cucumber.runtime.transformers.Transformer;
import gherkin.formatter.Argument;
import gherkin.formatter.model.Step;
File
Runtime.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
            } finally {
                long duration = System.nanoTime() - start;
                String status = e == null ? Result.PASSED : Result.FAILED;
<<<<<<< HEAD
                Result result = new Result(status, duration, e, DUMMY_ARG);
=======
                Result result = new Result(status, duration, e, null);
>>>>>>> 0ec74215c6b4105412da4d85bafb67790b6bfbb2
                reporter.result(result);
            }
        }
Solution content 
            } finally {
                long duration = System.nanoTime() - start;
                String status = e == null ? Result.PASSED : Result.FAILED;
                Result result = new Result(status, duration, e, DUMMY_ARG);
                reporter.result(result);
            }
        }
File
World.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
package cucumber.runtime.groovy;

<<<<<<< HEAD
import cucumber.classpath.Classpath;
import cucumber.classpath.Consumer;
import cucumber.io.Resource;
import cucumber.runtime.Backend;
import cucumber.runtime.CucumberException;
import cucumber.runtime.StepDefinition;
=======
>>>>>>> 0ec74215c6b4105412da4d85bafb67790b6bfbb2
import gherkin.formatter.model.Step;
import groovy.lang.Binding;
import groovy.lang.Closure;
Solution content 
package cucumber.runtime.groovy;

import cucumber.classpath.Classpath;
import cucumber.classpath.Consumer;
import cucumber.io.Resource;
import cucumber.runtime.Backend;
import cucumber.runtime.CucumberException;
import cucumber.runtime.StepDefinition;
import gherkin.formatter.model.Step;
import groovy.lang.Binding;
import groovy.lang.Closure;
File
GroovyBackend.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package cucumber.runtime.ioke;

<<<<<<< HEAD
import cucumber.Table;
import cucumber.classpath.Classpath;
import cucumber.classpath.Consumer;
import cucumber.io.Resource;
import cucumber.runtime.Backend;
import cucumber.runtime.CucumberException;
import cucumber.runtime.StepDefinition;
=======
>>>>>>> 0ec74215c6b4105412da4d85bafb67790b6bfbb2
import gherkin.formatter.model.Step;
import ioke.lang.IokeObject;
import ioke.lang.Message;
Solution content 
package cucumber.runtime.ioke;

import cucumber.Table;
import cucumber.classpath.Classpath;
import cucumber.classpath.Consumer;
import cucumber.io.Resource;
import cucumber.runtime.Backend;
import cucumber.runtime.CucumberException;
import cucumber.runtime.StepDefinition;
import gherkin.formatter.model.Step;
import ioke.lang.IokeObject;
import ioke.lang.Message;
File
IokeBackend.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package cucumber.runtime.rhino;

<<<<<<< HEAD
import cucumber.classpath.Classpath;
import cucumber.classpath.Consumer;
import cucumber.io.Resource;
import cucumber.runtime.*;
import cucumber.runtime.javascript.JavascriptSnippetGenerator;
=======
>>>>>>> 0ec74215c6b4105412da4d85bafb67790b6bfbb2
import gherkin.formatter.model.Step;

import java.io.IOException;
Solution content 
package cucumber.runtime.rhino;

import cucumber.classpath.Classpath;
import cucumber.classpath.Consumer;
import cucumber.io.Resource;
import cucumber.runtime.Backend;
import cucumber.runtime.CucumberException;
import cucumber.runtime.StepDefinition;
import cucumber.runtime.javascript.JavascriptSnippetGenerator;
import gherkin.formatter.model.Step;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.NativeFunction;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.tools.shell.Global;

import java.io.IOException;
File
RhinoBackend.java
Developer's decision
Manual
Kind of conflict
Import