resolve merge conflict

2020-06-14 21:29:31 +02:00
parent 613ec38694 247192f7dd
commit 2ab630f8eb
5 changed files with 249 additions and 3 deletions
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -138,6 +138,11 @@
         <string>Default</string>
        </property>
       </item>
+       <item>
+        <property name="text">
+         <string>test</string>
+        </property>
+       </item>
      </widget>
      <widget class="QCheckBox" name="chkFetchPrices">
       <property name="geometry">