Fix migrations conflicts

7 years ago · 4530d86029
2 changed files with 2 additions and 2 deletions
--- a/sapl/sessao/migrations/0028_auto_20181031_0902.py
+++ b/sapl/sessao/migrations/0028_auto_20181031_0902.py
@ -11,7 +11,7 @@ class Migration(migrations.Migration):
    dependencies = [
        ('materia', '0032_auto_20181022_1743'),
        ('parlamentares', '0025_auto_20180924_1724'),
-        ('sessao', '0027_auto_20181023_1239'),
+        ('sessao', '0028_auto_20181024_0848'),
    ]

    operations = [
--- a/sapl/sessao/migrations/0029_auto_20181024_0952.py
+++ b/sapl/sessao/migrations/0029_auto_20181024_0952.py
@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):

    dependencies = [
-        ('sessao', '0028_auto_20181024_0848'),
+        ('sessao', '0028_auto_20181031_0902'),
    ]

    operations = [