chore: Remove git stash markup

ed_lrr_gui/gui/ed_lrr.ui

@@ -44,15 +44,12 @@
    <enum>QTabWidget::Rounded</enum>
   </property>
   <widget class="QWidget" name="centralwidget">
-<<<<<<< Updated upstream
-=======
    <property name="sizePolicy">
     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
      <horstretch>0</horstretch>
      <verstretch>0</verstretch>
     </sizepolicy>
    </property>
->>>>>>> Stashed changes
    <layout class="QVBoxLayout" name="verticalLayout">
     <item>
      <widget class="QTabWidget" name="tabs">
@@ -372,11 +369,7 @@
         <item row="1" column="0">
          <widget class="QPushButton" name="btn_add">
           <property name="text">
-<<<<<<< Updated upstream
-           <string>Search+Add</string>
-=======
            <string>Add</string>
->>>>>>> Stashed changes
           </property>
          </widget>
         </item>
@@ -415,16 +408,6 @@
           </item>
          </layout>
         </item>
-<<<<<<< Updated upstream
-        <item row="4" column="0">
-         <widget class="QPushButton" name="btn_permute">
-          <property name="text">
-           <string>Permute</string>
-          </property>
-         </widget>
-        </item>
-=======
->>>>>>> Stashed changes
         <item row="7" column="0" colspan="2">
          <widget class="QTreeWidget" name="lst_sys">
           <property name="sizePolicy">
@@ -461,13 +444,6 @@
            <enum>QAbstractItemView::SelectRows</enum>
           </property>
           <property name="headerHidden">
-<<<<<<< Updated upstream
-           <bool>true</bool>
-          </property>
-          <column>
-           <property name="text">
-            <string notr="true">1</string>
-=======
            <bool>false</bool>
           </property>
           <attribute name="headerVisible">
@@ -481,33 +457,21 @@
           <column>
            <property name="text">
             <string>Type</string>
->>>>>>> Stashed changes
            </property>
           </column>
          </widget>
         </item>
-<<<<<<< Updated upstream
-        <item row="8" column="1">
-         <widget class="QDoubleSpinBox" name="sb_range"/>
-        </item>
-        <item row="8" column="0">
-=======
         <item row="9" column="1">
          <widget class="QDoubleSpinBox" name="sb_range"/>
         </item>
         <item row="9" column="0">
->>>>>>> Stashed changes
          <widget class="QLabel" name="lbl_range">
           <property name="text">
            <string>Jump Range (Ly)</string>
           </property>
          </widget>
         </item>
-<<<<<<< Updated upstream
-        <item row="9" column="0" colspan="2">
-=======
         <item row="10" column="0" colspan="2">
->>>>>>> Stashed changes
          <layout class="QGridLayout" name="gr_opts">
           <item row="0" column="2">
            <widget class="QComboBox" name="cmb_mode">
@@ -579,11 +543,7 @@
           </item>
          </layout>
         </item>
-<<<<<<< Updated upstream
-        <item row="10" column="0">
-=======
         <item row="11" column="0">
->>>>>>> Stashed changes
          <widget class="QPushButton" name="btn_go">
           <property name="text">
            <string>GO!</string>
@@ -595,22 +555,14 @@
         </item>
         <item row="4" column="1">
          <layout class="QGridLayout" name="gridLayout_4">
-<<<<<<< Updated upstream
-          <item row="0" column="2">
-=======
           <item row="0" column="3">
->>>>>>> Stashed changes
            <widget class="QCheckBox" name="chk_permute_keep_last">
             <property name="text">
              <string>Last</string>
             </property>
            </widget>
           </item>
-<<<<<<< Updated upstream
-          <item row="0" column="1">
-=======
           <item row="0" column="2">
->>>>>>> Stashed changes
            <widget class="QCheckBox" name="chk_permute_keep_first">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -626,11 +578,7 @@
             </property>
            </widget>
           </item>
-<<<<<<< Updated upstream
-          <item row="0" column="0">
-=======
           <item row="0" column="1">
->>>>>>> Stashed changes
            <widget class="QLabel" name="lbl_keep">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -645,8 +593,6 @@
           </item>
          </layout>
         </item>
-<<<<<<< Updated upstream
-=======
         <item row="4" column="0">
          <widget class="QCheckBox" name="chk_permute">
           <property name="text">
@@ -661,7 +607,6 @@
           </property>
          </widget>
         </item>
->>>>>>> Stashed changes
        </layout>
       </widget>
       <widget class="QWidget" name="tab_log">
@@ -709,9 +654,6 @@
     </property>
     <addaction name="menu_act_quit"/>
    </widget>
-<<<<<<< Updated upstream
-   <addaction name="menu_file"/>
-=======
    <widget class="QMenu" name="menuWindow">
     <property name="title">
      <string>Window</string>
@@ -725,7 +667,6 @@
    </widget>
    <addaction name="menu_file"/>
    <addaction name="menuWindow"/>
->>>>>>> Stashed changes
   </widget>
   <widget class="QStatusBar" name="bar_status"/>
   <action name="menu_act_quit">
@@ -736,8 +677,6 @@
     <string>Ctrl+Q</string>
    </property>
   </action>
-<<<<<<< Updated upstream
-=======
   <action name="actionA">
    <property name="text">
     <string>A</string>
@@ -748,7 +687,6 @@
     <string>B</string>
    </property>
   </action>
->>>>>>> Stashed changes
  </widget>
  <tabstops>
   <tabstop>rd_comp</tabstop>