From a394bc518af94c1315520a5106ebabd147642776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <cont.joaorodrigues@gmail.com>
Date: Thu, 29 Aug 2019 12:06:38 -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

---
 ...{0055_auto_20190829_1152.py => 0056_auto_20190829_1206.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename sapl/materia/migrations/{0055_auto_20190829_1152.py => 0056_auto_20190829_1206.py} (86%)

diff --git a/sapl/materia/migrations/0055_auto_20190829_1152.py b/sapl/materia/migrations/0056_auto_20190829_1206.py
similarity index 86%
rename from sapl/materia/migrations/0055_auto_20190829_1152.py
rename to sapl/materia/migrations/0056_auto_20190829_1206.py
index 5947ad7a5..965760412 100644
--- a/sapl/materia/migrations/0055_auto_20190829_1152.py
+++ b/sapl/materia/migrations/0056_auto_20190829_1206.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-29 14:52
+# Generated by Django 1.11.20 on 2019-08-29 15:06
 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', '0054_merge_20190802_1112'),
+        ('materia', '0055_auto_20190816_0943'),
     ]
 
     operations = [