fix migration conflicts

7 years ago · 3740d9b3a1
1 changed files with 1 additions and 1 deletions
--- a/sapl/sessao/migrations/0030_resumoordenacao_decimo_primeiro.py
+++ b/sapl/sessao/migrations/0030_resumoordenacao_decimo_primeiro.py
@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
-        ('sessao', '0029_auto_20181024_0952'),
+        ('sessao', '0031_auto_20181116_1849'),
    ]
    operations = [