FIx up some merge problems that slipped through the last commit. I

should be slapped for that.

mainwindow.h

@@ -59,11 +59,8 @@ private slots:
     void showComparisonWindow();
     void showSettingsDialog();
     void showFirmwareUploaderWindow();
-<<<<<<< HEAD
     void showConnectionSettingsWindow();
-=======
     void showScriptingWindow();
->>>>>>> WIP2
     void exitApp();
     void handleSaveDecoded();
     void changeBaudRates();
@@ -129,12 +126,9 @@ private:
     MainSettingsDialog *settingsDialog;
     DiscreteStateWindow *discreteStateWindow;
     FirmwareUploaderWindow *firmwareUploaderWindow;
-<<<<<<< HEAD
     ConnectionWindow *connectionWindow;
-=======
     ScriptingWindow *scriptingWindow;
     RangeStateWindow *rangeWindow;
->>>>>>> WIP2
 
     //various private storage
     QLabel lbStatusConnected;