Projects >> operaprestodriver >>0299f32193830155860663beb39f6989780b3ae4

Chunk
Conflicting content 
import com.opera.core.systems.scope.services.IWindowManager;
import com.opera.core.systems.settings.OperaDriverSettings;

<<<<<<< HEAD
public class OperaDriver extends RemoteWebDriver implements WebDriver,
    FindsByLinkText, FindsById, FindsByXPath, FindsByName, FindsByTagName,
    FindsByClassName, FindsByCssSelector, SearchContext, JavascriptExecutor,
    TakesScreenshot {
=======
/**
 * Opera's webdriver implementation. See AUTHORS and LICENSE for details
 *
 */
public class OperaDriver implements WebDriver, FindsByLinkText, FindsById,
    FindsByXPath, FindsByName, FindsByTagName, FindsByClassName,
    FindsByCssSelector, SearchContext, JavascriptExecutor, TakesScreenshot,
    HasInputDevices {
>>>>>>> ffda6ac515a1b68080174e58ade49119acf88272

  /*
   * These are "protected" and not "private" so that we can extend this class
Solution content 
import com.opera.core.systems.scope.services.IWindowManager;
import com.opera.core.systems.settings.OperaDriverSettings;

public class OperaDriver extends RemoteWebDriver implements WebDriver,
    FindsByLinkText, FindsById, FindsByXPath, FindsByName, FindsByTagName,
    FindsByClassName, FindsByCssSelector, SearchContext, JavascriptExecutor,
    TakesScreenshot, HasInputDevices {

  /*
   * These are "protected" and not "private" so that we can extend this class
File
OperaDriver.java
Developer's decision
Manual
Kind of conflict
Class signature
Comment