From 92cd5e5de1928489a90ea2949b230bfa2ecacf7b Mon Sep 17 00:00:00 2001
From: Mariana Mendes <mare.s.mendes@gmail.com>
Date: Tue, 30 Oct 2018 10:39:45 -0200
Subject: [PATCH] =?UTF-8?q?Corrige=20as=20migra=C3=A7=C3=B5es=20para=20evi?=
 =?UTF-8?q?tar=20conflito?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0032_proposicao_observacao.py  | 20 -------------------
 ...ancelado.py => 0033_auto_20181030_1039.py} |  9 +++++++--
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 sapl/materia/migrations/0032_proposicao_observacao.py
 rename sapl/materia/migrations/{0033_proposicao_cancelado.py => 0033_auto_20181030_1039.py} (60%)

diff --git a/sapl/materia/migrations/0032_proposicao_observacao.py b/sapl/materia/migrations/0032_proposicao_observacao.py
deleted file mode 100644
index b7c3ca4e9..000000000
--- a/sapl/materia/migrations/0032_proposicao_observacao.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-10-10 13:07
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0031_auto_20180924_1724'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='proposicao',
-            name='observacao',
-            field=models.TextField(blank=True, verbose_name='Observação'),
-        ),
-    ]
diff --git a/sapl/materia/migrations/0033_proposicao_cancelado.py b/sapl/materia/migrations/0033_auto_20181030_1039.py
similarity index 60%
rename from sapl/materia/migrations/0033_proposicao_cancelado.py
rename to sapl/materia/migrations/0033_auto_20181030_1039.py
index 93788c03f..f8695cc57 100644
--- a/sapl/materia/migrations/0033_proposicao_cancelado.py
+++ b/sapl/materia/migrations/0033_auto_20181030_1039.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.13 on 2018-10-16 10:47
+# Generated by Django 1.9.13 on 2018-10-30 12:39
 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', '0032_proposicao_observacao'),
+        ('materia', '0032_auto_20181022_1743'),
     ]
 
     operations = [
@@ -17,4 +17,9 @@ class Migration(migrations.Migration):
             name='cancelado',
             field=models.BooleanField(choices=[(True, 'Sim'), (False, 'Não')], default=False, verbose_name='Cancelada ?'),
         ),
+        migrations.AddField(
+            model_name='proposicao',
+            name='observacao',
+            field=models.TextField(blank=True, verbose_name='Observação'),
+        ),
     ]