Projects >> operaprestodriver >>689cf7ed38b0222a36aee0d03d290f66ae9febc0

Chunk
Conflicting content
    File launcher = settings.getLauncher();
    try {
<<<<<<< HEAD
      if (settings.getLauncher().getCanonicalPath().equals(LAUNCHER_DEFAULT_LOCATION.getCanonicalPath()) &&
          (!settings.getLauncher().exists() || isLauncherOutdated(launcher))) {
=======
      if (settings.getLauncher().getCanonicalPath().equals(
          launcherDefaultLocation().getCanonicalPath()) &&
          (!settings.getLauncher().exists() || isLauncherOutdated(settings.getLauncher()))) {
        // Delete old launchers
        deleteFiles(launcherDefaultLocation().getParentFile().listFiles());

>>>>>>> 63bd87a90bda228baf27ab97cbf479f11fcd0d23
        extractLauncher(bundledLauncher, settings.getLauncher());
      }
    } catch (IOException e) {
Solution content
    File launcher = settings.getLauncher();
    try {
      if (launcher.getCanonicalPath().equals(LAUNCHER_DEFAULT_LOCATION.getCanonicalPath()) &&
          (!launcher.exists() || isLauncherOutdated(launcher))) {
        deleteFiles(LAUNCHER_DEFAULT_LOCATION.getParentFile().listFiles());
        extractLauncher(bundledLauncher, launcher);
      }
    } catch (IOException e) {
File
OperaLauncherRunner.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method invocation