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

should be slapped for that.

mainwindow.cpp

@@ -109,7 +109,6 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(ui->actionLoad_Filter_Definition, &QAction::triggered, this, &MainWindow::handleLoadFilters);
     connect(ui->actionSave_Filter_Definition, &QAction::triggered, this, &MainWindow::handleSaveFilters);
     connect(ui->action_Playback, &QAction::triggered, this, &MainWindow::showPlaybackWindow);
-    connect(ui->btnBaudSet, &QAbstractButton::clicked, this, &MainWindow::changeBaudRates);
     connect(ui->actionFlow_View, &QAction::triggered, this, &MainWindow::showFlowViewWindow);
     connect(ui->action_Custom, &QAction::triggered, this, &MainWindow::showFrameSenderWindow);
     connect(ui->actionLoad_DBC_File, &QAction::triggered, this, &MainWindow::handleLoadDBC);

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;

mainwindow.ui

@@ -355,6 +355,8 @@
   <action name="actionConnect">
    <property name="text">
     <string>Connect</string>
+    </property>
+  </action>
   <action name="actionScripting_INterface">
    <property name="text">
     <string>Scripting Interface</string>