resolution

9ced2c6f · Gertulla, Janis Luca · 6382b8f4 · d6ae6c44 · 9ced2c6f · 9ced2c6f
Commit 9ced2c6f authored Oct 10, 2020 by Gertulla, Janis Luca
--- a/UE49Interlock.pro.user
+++ b/UE49Interlock.pro.user
--- a/UE49Interlock.pro.user.9501c15.20
+++ b/UE49Interlock.pro.user.9501c15.20
--- a/ino/ControllerMduino57Plus/ControllerMduino57Plus.ino
+++ b/ino/ControllerMduino57Plus/ControllerMduino57Plus.ino
--- a/maintab.ui
+++ b/maintab.ui
@@ -179,8 +179,13 @@
  <widget class="QLabel" name="tDpsLabel">
   <property name="geometry">
    <rect>
+<<<<<<< HEAD
     <x>490</x>
     <y>410</y>
+=======
+     <x>650</x>
+     <y>60</y>
+>>>>>>> d6ae6c4492c0852bab2d27ec9e6b082d5b701f42
     <width>60</width>
     <height>30</height>
    </rect>