Conflit dans les migrations

2016-07-29 22:29:20 +02:00 · 2016-07-29 22:29:20 +02:00 · b9ed81453d
commit b9ed81453d
parent bbc4b59bfe
1 changed files with 1 additions and 1 deletions
--- a/gestioncof/migrations/0006_add_calendar.py
+++ b/gestioncof/migrations/0006_add_calendar.py
@ -10,7 +10,7 @@ class Migration(migrations.Migration):
    dependencies = [
        ('bda', '0004_mails-rappel'),
        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('gestioncof', '0004_registration_mail'),
+        ('gestioncof', '0005_encoding'),
    ]

    operations = [