From b9ed81453d53a9175a0486c1d9872a296c07dee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 29 Jul 2016 22:29:20 +0200
Subject: [PATCH] Conflit dans les migrations

---
 .../migrations/{0005_add_calendar.py => 0006_add_calendar.py}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename gestioncof/migrations/{0005_add_calendar.py => 0006_add_calendar.py} (97%)

diff --git a/gestioncof/migrations/0005_add_calendar.py b/gestioncof/migrations/0006_add_calendar.py
similarity index 97%
rename from gestioncof/migrations/0005_add_calendar.py
rename to gestioncof/migrations/0006_add_calendar.py
index 5d894f13..004d3602 100644
--- a/gestioncof/migrations/0005_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 = [