From bd77b7e5a22283cfb80bb14d8103bfe31612cd58 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Tue, 31 Jan 2012 19:26:48 -0600
Subject: [PATCH] Fix stupid commit on my part.  Thanks for heads up brian.

---
 .../src/plugins/config/cc_hw_settings.ui         | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
index 92af8e26d..e64800124 100644
--- a/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
+++ b/ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
@@ -68,11 +68,7 @@
           </property>
          </widget>
         </item>
-<<<<<<< HEAD
         <item row="1" column="5">
-=======
-        <item row="1" column="4">
->>>>>>> master
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -85,7 +81,6 @@
           </property>
          </spacer>
         </item>
-<<<<<<< HEAD
         <item row="1" column="4">
          <widget class="QLabel" name="label_8">
           <property name="text">
@@ -112,8 +107,6 @@
         <item row="4" column="4">
          <widget class="QComboBox" name="cbUsbVcp"/>
         </item>
-=======
->>>>>>> master
         <item row="0" column="1">
          <widget class="QLabel" name="label_7">
           <property name="text">
@@ -153,7 +146,6 @@
             </property>
            </widget>
           </item>
-<<<<<<< HEAD
           <item row="2" column="0">
            <widget class="QLabel" name="ComUsbBridgeSpeedLabel">
             <property name="minimumSize">
@@ -167,8 +159,6 @@
             </property>
            </widget>
           </item>
-=======
->>>>>>> master
           <item row="0" column="1">
            <widget class="QComboBox" name="telemetrySpeed">
             <property name="toolTip">
@@ -183,7 +173,6 @@
             </property>
            </widget>
           </item>
-<<<<<<< HEAD
           <item row="2" column="1">
            <widget class="QComboBox" name="comUsbBridgeSpeed">
             <property name="toolTip">
@@ -191,8 +180,6 @@
             </property>
            </widget>
           </item>
-=======
->>>>>>> master
          </layout>
         </item>
         <item>
@@ -356,10 +343,7 @@ Beware of not locking yourself out!</string>
   </layout>
  </widget>
  <resources>
-<<<<<<< HEAD
   <include location="configgadget.qrc"/>
-=======
->>>>>>> master
   <include location="../coreplugin/core.qrc"/>
  </resources>
  <connections/>