Mercurial Repositories > Django Project / file diff

diff -r 5c925935cbb9 -r d280acf98fb5 ProjectDjango/DjangoMakeMigrationsDialog.ui
--- a/ProjectDjango/DjangoMakeMigrationsDialog.ui	Sat Jan 27 11:46:33 2018 +0100
+++ b/ProjectDjango/DjangoMakeMigrationsDialog.ui	Sat Mar 24 19:11:39 2018 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>168</height>
+    <height>198</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -65,6 +65,16 @@
     </widget>
    </item>
    <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="mergeCheckBox">
+     <property name="toolTip">
+      <string>Select to fix migration conflicts</string>
+     </property>
+     <property name="text">
+      <string>Fix migration conflicts</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
     <widget class="QCheckBox" name="dryrunCheckBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -80,7 +90,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="5" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -103,6 +113,7 @@
   <tabstop>applicationsComboBox</tabstop>
   <tabstop>nameEdit</tabstop>
   <tabstop>emptyCheckBox</tabstop>
+  <tabstop>mergeCheckBox</tabstop>
   <tabstop>dryrunCheckBox</tabstop>
  </tabstops>
  <resources/>