rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Fix stupid commit on my part. Thanks for heads up brian.

Browse Source
This commit is contained in:
James Cotton 2012-01-31 19:26:48 -06:00
parent eaf9a4bded
commit bd77b7e5a2
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ground/openpilotgcs/src/plugins/config/cc_hw_settings.ui
View File

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