From 4d59931411f1cec00a764b7cf6517a25fadb37e6 Mon Sep 17 00:00:00 2001
From: DTILegBG <cpd@camarabento.rs.gov.br>
Date: Tue, 5 Sep 2017 08:57:20 -0300
Subject: [PATCH] makemigrations --merge

---
 sapl/materia/migrations/0014_merge.py       | 16 ++++++++++++++++
 sapl/parlamentares/migrations/0009_merge.py | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 sapl/materia/migrations/0014_merge.py
 create mode 100644 sapl/parlamentares/migrations/0009_merge.py

diff --git a/sapl/materia/migrations/0014_merge.py b/sapl/materia/migrations/0014_merge.py
new file mode 100644
index 000000000..2fc9b78fc
--- /dev/null
+++ b/sapl/materia/migrations/0014_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-09-05 08:56
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0013_adiciona_status_tramitacao'),
+        ('materia', '0013_auto_20170905_0818'),
+    ]
+
+    operations = [
+    ]
diff --git a/sapl/parlamentares/migrations/0009_merge.py b/sapl/parlamentares/migrations/0009_merge.py
new file mode 100644
index 000000000..5cc282070
--- /dev/null
+++ b/sapl/parlamentares/migrations/0009_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-09-05 08:56
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parlamentares', '0008_adiciona_cargos_mesa'),
+        ('parlamentares', '0006_auto_20170905_0833'),
+    ]
+
+    operations = [
+    ]