Evitar merge de migrações

sapl/materia/migrations/0055_auto_20190829_1152.py → sapl/materia/migrations/0056_auto_20190829_1206.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-29 14:52
+# Generated by Django 1.11.20 on 2019-08-29 15:06
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0054_merge_20190802_1112'),
+        ('materia', '0055_auto_20190816_0943'),
     ]
 
     operations = [