Projects >> operaprestodriver >>4e8094f1741d2e74e7f3a60c9e13b04465dde1dc

Chunk
Conflicting content 
import com.google.common.io.Files;

import com.opera.core.systems.runner.OperaRunnerException;
<<<<<<< HEAD
import com.opera.core.systems.testing.drivers.TestOperaDriver;
=======
import com.opera.core.systems.runner.launcher.OperaLauncherRunnerSettings;
>>>>>>> 41d097811396b7d1a48e3263cf57aafd41dafc62

import org.junit.After;
import org.junit.AfterClass;
Solution content 
import com.google.common.io.Files;

import com.opera.core.systems.runner.OperaRunnerException;
<<<<<<< HEAD
import com.opera.core.systems.testing.drivers.TestOperaDriver;
=======
import com.opera.core.systems.runner.launcher.OperaLauncherRunnerSettings;
>>>>>>> 41d097811396b7d1a48e3263cf57aafd41dafc62

import org.junit.After;
import org.junit.AfterClass;
File
DesiredCapabilitiesTest.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
   * Overrides {@link OperaDriverTestCase#setup()}
   */
  @BeforeClass
<<<<<<< HEAD
  public static void setup() {
=======
  public static void setUpBeforeClass() {
    if (Platform.getCurrent().is(Platform.WINDOWS)) {
      fakeBinary = new File("C:\\WINDOWS\\system32\\find.exe");
    } else {
      fakeBinary = new File("/bin/echo");
    }
>>>>>>> 41d097811396b7d1a48e3263cf57aafd41dafc62
  }

  /**
Solution content 
   * Overrides {@link OperaDriverTestCase#setup()}
   */
  @BeforeClass
  public static void setup() {
  }

  /**
File
DesiredCapabilitiesTest.java
Developer's decision
Version 1
Kind of conflict
If statement
Method signature