From 2f271938a6872d31043d164b01e42ddf0e90dc3f 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:47:54 -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

---
 .../norma/migrations/0027_merge_20190807_1705.py | 16 ----------------
 ...ao.py => 0027_normajuridica_ultima_edicao.py} |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 sapl/norma/migrations/0027_merge_20190807_1705.py
 rename sapl/norma/migrations/{0026_normajuridica_ultima_edicao.py => 0027_normajuridica_ultima_edicao.py} (81%)

diff --git a/sapl/norma/migrations/0027_merge_20190807_1705.py b/sapl/norma/migrations/0027_merge_20190807_1705.py
deleted file mode 100644
index 8795c722a..000000000
--- a/sapl/norma/migrations/0027_merge_20190807_1705.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-07 20:05
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('norma', '0026_auto_20190712_1053'),
-        ('norma', '0026_normajuridica_ultima_edicao'),
-    ]
-
-    operations = [
-    ]
diff --git a/sapl/norma/migrations/0026_normajuridica_ultima_edicao.py b/sapl/norma/migrations/0027_normajuridica_ultima_edicao.py
similarity index 81%
rename from sapl/norma/migrations/0026_normajuridica_ultima_edicao.py
rename to sapl/norma/migrations/0027_normajuridica_ultima_edicao.py
index 7fa7a8da9..c01ff22a5 100644
--- a/sapl/norma/migrations/0026_normajuridica_ultima_edicao.py
+++ b/sapl/norma/migrations/0027_normajuridica_ultima_edicao.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-02 19:05
+# Generated by Django 1.11.20 on 2019-08-29 14:41
 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 = [
-        ('norma', '0025_auto_20190704_1403'),
+        ('norma', '0026_auto_20190712_1053'),
     ]
 
     operations = [