2
0
fiffty-50 4 жил өмнө
parent
commit
1c49cfce15

+ 1 - 5
openPilotLog.pro.user

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<<<<<<< HEAD
-<!-- Written by QtCreator 4.11.0, 2020-11-19T14:34:08. -->
-=======
-<!-- Written by QtCreator 4.13.2, 2020-11-19T10:28:36. -->
->>>>>>> 05756c4d480539da9d964c37aa2e3b7e7054e705
+<!-- Written by QtCreator 4.13.2, 2020-11-19T18:16:28. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

+ 3 - 3
src/gui/dialogues/newflight.ui

@@ -129,7 +129,7 @@
           </size>
          </property>
          <property name="text">
-          <string>Name</string>
+          <string/>
          </property>
         </widget>
        </item>
@@ -197,7 +197,7 @@
           </size>
          </property>
          <property name="text">
-          <string>Name</string>
+          <string/>
          </property>
         </widget>
        </item>
@@ -427,7 +427,7 @@
           </size>
          </property>
          <property name="text">
-          <string>Type</string>
+          <string/>
          </property>
         </widget>
        </item>