From a94520542207518bf4a3cb4f611904076de610c3 Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Tue, 23 May 2017 18:29:26 -0300
Subject: [PATCH] Faz o merge das migrations

---
 sapl/materia/migrations/0006_merge.py | 16 ++++++++++++++++
 sapl/norma/migrations/0005_merge.py   | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 sapl/materia/migrations/0006_merge.py
 create mode 100644 sapl/norma/migrations/0005_merge.py

diff --git a/sapl/materia/migrations/0006_merge.py b/sapl/materia/migrations/0006_merge.py
new file mode 100644
index 000000000..c3ffdd30d
--- /dev/null
+++ b/sapl/materia/migrations/0006_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-05-23 18:20
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0005_auto_20170522_1051'),
+        ('materia', '0005_auto_20170522_1904'),
+    ]
+
+    operations = [
+    ]
diff --git a/sapl/norma/migrations/0005_merge.py b/sapl/norma/migrations/0005_merge.py
new file mode 100644
index 000000000..0e3cc25d0
--- /dev/null
+++ b/sapl/norma/migrations/0005_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-05-23 18:20
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('norma', '0004_auto_20170522_1115'),
+        ('norma', '0004_auto_20170522_1051'),
+    ]
+
+    operations = [
+    ]