makemigrations --merge

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 = [
+    ]

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 = [
+    ]