Cleaned up mess from merging

src/QGCApplication.cc

@@ -498,20 +498,11 @@ void QGCApplication::saveTempFlightDataLogOnMainThread(QString tempLogfile)
             if(QFile::exists(saveFilename) && !QFile::remove(saveFilename)){
                 // if the file cannot be removed, prompt user and ask new path
                 saveError = true;
-<<<<<<< Updated upstream
-                QMessageBox::warning (MainWindow::instance(), "File Error","Could not overwrite existing file.\nPlease provide a different file name to save to.");
-                QFile::copy(tempLogfile, saveFilename);
-            } else if(!QFile::copy(tempLogfile, saveFilename)) {
-                // if file could not be copied, prompt user and ask new path
-                saveError = true;
-                QMessageBox::warning (MainWindow::instance(), "File Error","Could not create file.\nPlease provide a different file name to save to.");
-=======
                 QGCApplication::criticalMessageBoxOnMainThread("File Error","Could not overwrite existing file.\nPlease provide a different file name to save to.");
             } else if(!QFile::copy(tempLogfile, saveFilename)) {
                 // if file could not be copied, prompt user and ask new path
                 saveError = true;
                 QGCApplication::criticalMessageBoxOnMainThread("File Error","Could not create file.\nPlease provide a different file name to save to.");
->>>>>>> Stashed changes
             }
         }
     } while(saveError); // if the file could not be overwritten, ask for new file