merge

sapl/materia/migrations/0037_merge_20190108_1538.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2019-01-08 17:38
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0036_auto_20190106_0330'),
+        ('materia', '0034_auto_20190107_1402'),
+    ]
+
+    operations = [
+    ]

sapl/norma/migrations/0021_merge_20190108_1538.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2019-01-08 17:38
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('norma', '0020_auto_20190107_1407'),
+        ('norma', '0020_auto_20190106_0454'),
+    ]
+
+    operations = [
+    ]

sapl/protocoloadm/migrations/0014_merge_20190108_1538.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2019-01-08 17:38
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('protocoloadm', '0011_auto_20190107_1407'),
+        ('protocoloadm', '0013_auto_20190106_1336'),
+    ]
+
+    operations = [
+    ]