Evitar merge de migrações

sapl/materia/migrations/0052_tramitacao_ultima_edicao.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-01 22:45
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0051_auto_20190703_1414'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='tramitacao',
-            name='ultima_edicao',
-            field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'),
-        ),
-    ]

sapl/materia/migrations/0053_materialegislativa_ultima_edicao.py → sapl/materia/migrations/0055_auto_20190829_1152.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-01 23:32
+# Generated by Django 1.11.20 on 2019-08-29 14:52
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0052_tramitacao_ultima_edicao'),
+        ('materia', '0054_merge_20190802_1112'),
     ]
 
     operations = [
@@ -17,4 +17,9 @@ class Migration(migrations.Migration):
             name='ultima_edicao',
             field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'),
         ),
+        migrations.AddField(
+            model_name='tramitacao',
+            name='ultima_edicao',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Data e Hora da Edição'),
+        ),
     ]

sapl/materia/migrations/0055_merge_20190807_1706.py

@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-07 20:06
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0053_materialegislativa_ultima_edicao'),
-        ('materia', '0054_merge_20190802_1112'),
-    ]
-
-    operations = [
-    ]