makemigrations --merge

sapl/base/migrations/0008_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-08-09 07:46
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0007_auto_20170808_0850'),
+        ('base', '0007_auto_20170808_1713'),
+    ]
+
+    operations = [
+    ]

sapl/materia/migrations/0012_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-08-09 07:46
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0011_auto_20170808_1034'),
+        ('materia', '0010_auto_20170808_1713'),
+    ]
+
+    operations = [
+    ]