From 5137b47c0a51d67ddefadaf1b4813d1b239fe6f4 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Wed, 16 Jan 2019 20:44:04 +0000
Subject: [PATCH] Switch off nag window for develop

---
 widgets/mainwindow.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 29070c291..a3c031c53 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -946,14 +946,10 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   splashTimer.setSingleShot (true);
   splashTimer.start (20 * 1000);
 
-<<<<<<< HEAD
   if(QCoreApplication::applicationVersion().contains("-devel") or
      QCoreApplication::applicationVersion().contains("-rc")) {
-    QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
+    // QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
   }
-=======
-  //QTimer::singleShot (0, this, SLOT (not_GA_warning_message ()));
->>>>>>> hotfix-2.0.1-rc1
 
   if(!ui->cbMenus->isChecked()) {
     ui->cbMenus->setChecked(true);