Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/Documentation/source/Plugin_Project_Django.ProjectDjango.DjangoMakeMigrationsDialog.html	Sat Jan 27 11:46:33 2018 +0100
+++ b/ProjectDjango/Documentation/source/Plugin_Project_Django.ProjectDjango.DjangoMakeMigrationsDialog.html	Sat Mar 24 19:11:39 2018 +0100
@@ -90,12 +90,13 @@
 <dt>Returns:</dt>
 <dd>
 tuple containing the application names, a migration name,
-            the dry-run flag and a flag for an empty migration
+            the dry-run flag, a flag for an empty migration and a flag
+            indicating to fix migration conflicts
 </dd>
 </dl><dl>
 <dt>Return Type:</dt>
 <dd>
-tuple of (str, str, bool, bool)
+tuple of (str, str, bool, bool, bool)
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>