From 384956045447250a54766c9f15439743044a5ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <cont.joaorodrigues@gmail.com>
Date: Thu, 29 Aug 2019 11:58:16 -0300
Subject: [PATCH] =?UTF-8?q?Evitar=20merge=20de=20migra=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0052_tramitacao_ultima_edicao.py          | 20 -------------------
 ...a_edicao.py => 0055_auto_20190829_1152.py} |  9 +++++++--
 .../migrations/0055_merge_20190807_1706.py    | 16 ---------------
 3 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 sapl/materia/migrations/0052_tramitacao_ultima_edicao.py
 rename sapl/materia/migrations/{0053_materialegislativa_ultima_edicao.py => 0055_auto_20190829_1152.py} (57%)
 delete mode 100644 sapl/materia/migrations/0055_merge_20190807_1706.py

diff --git a/sapl/materia/migrations/0052_tramitacao_ultima_edicao.py b/sapl/materia/migrations/0052_tramitacao_ultima_edicao.py
deleted file mode 100644
index 6be7aa254..000000000
--- a/sapl/materia/migrations/0052_tramitacao_ultima_edicao.py
+++ /dev/null
@@ -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'),
-        ),
-    ]
diff --git a/sapl/materia/migrations/0053_materialegislativa_ultima_edicao.py b/sapl/materia/migrations/0055_auto_20190829_1152.py
similarity index 57%
rename from sapl/materia/migrations/0053_materialegislativa_ultima_edicao.py
rename to sapl/materia/migrations/0055_auto_20190829_1152.py
index 9f8b0f4f2..5947ad7a5 100644
--- a/sapl/materia/migrations/0053_materialegislativa_ultima_edicao.py
+++ b/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'),
+        ),
     ]
diff --git a/sapl/materia/migrations/0055_merge_20190807_1706.py b/sapl/materia/migrations/0055_merge_20190807_1706.py
deleted file mode 100644
index 8e75b09fc..000000000
--- a/sapl/materia/migrations/0055_merge_20190807_1706.py
+++ /dev/null
@@ -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 = [
-    ]