From e843818a620fde5c1038ebd56718a28861442f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <cont.joaorodrigues@gmail.com>
Date: Wed, 1 Apr 2020 14:08:10 -0300
Subject: [PATCH] Fix migrations

---
 .../migrations/0065_auto_20200313_1137.py        |  2 +-
 .../migrations/0067_merge_20200401_1354.py       | 16 ++++++++++++++++
 sapl/norma/migrations/0032_auto_20200221_1533.py |  2 +-
 .../norma/migrations/0033_merge_20200401_1354.py | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 sapl/materia/migrations/0067_merge_20200401_1354.py
 create mode 100644 sapl/norma/migrations/0033_merge_20200401_1354.py

diff --git a/sapl/materia/migrations/0065_auto_20200313_1137.py b/sapl/materia/migrations/0065_auto_20200313_1137.py
index 9c6c8d5d5..f5e310a80 100644
--- a/sapl/materia/migrations/0065_auto_20200313_1137.py
+++ b/sapl/materia/migrations/0065_auto_20200313_1137.py
@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0064_auto_20200114_1121'),
+        ('materia', '0064_merge_20200114_1119'),
     ]
 
     operations = [
diff --git a/sapl/materia/migrations/0067_merge_20200401_1354.py b/sapl/materia/migrations/0067_merge_20200401_1354.py
new file mode 100644
index 000000000..1bfa50d30
--- /dev/null
+++ b/sapl/materia/migrations/0067_merge_20200401_1354.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-04-01 16:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0066_auto_20200313_1441'),
+        ('materia', '0065_auto_20200114_1125'),
+    ]
+
+    operations = [
+    ]
diff --git a/sapl/norma/migrations/0032_auto_20200221_1533.py b/sapl/norma/migrations/0032_auto_20200221_1533.py
index 810db5480..bc78d407d 100644
--- a/sapl/norma/migrations/0032_auto_20200221_1533.py
+++ b/sapl/norma/migrations/0032_auto_20200221_1533.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('norma', '0031_auto_20200114_1121'),
+        ('norma', '0031_merge_20191217_1538'),
     ]
 
     operations = [
diff --git a/sapl/norma/migrations/0033_merge_20200401_1354.py b/sapl/norma/migrations/0033_merge_20200401_1354.py
new file mode 100644
index 000000000..2e8758853
--- /dev/null
+++ b/sapl/norma/migrations/0033_merge_20200401_1354.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-04-01 16:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('norma', '0032_auto_20200114_1125'),
+        ('norma', '0032_auto_20200221_1533'),
+    ]
+
+    operations = [
+    ]