| Chunk |
|---|
| Conflicting content |
|---|
import org.openqa.selenium.WebElement;
import org.openqa.selenium.firefox.FirefoxDriver;
<<<<<<< HEAD
import cucumber.api.java.After;
import cucumber.api.java.Before;
=======
import cucumber.annotation.After;
import cucumber.annotation.Before;
import java.util.concurrent.TimeUnit;
>>>>>>> 22ff8f12a09052b66b299fbb388d53fcd5390e75
public class WebConnector {
private final static long DEFAULT_TIMEOUT = 2000; |
| Solution content |
|---|
import org.openqa.selenium.WebElement;
import org.openqa.selenium.firefox.FirefoxDriver;
import cucumber.api.java.After;
import cucumber.api.java.Before;
import java.util.concurrent.TimeUnit;
public class WebConnector {
private final static long DEFAULT_TIMEOUT = 2000; |
| File |
|---|
| WebConnector.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |