From b052e97663f6a28274d59d37229f4fd5c5c63765 Mon Sep 17 00:00:00 2001
From: Hugo Levy--Falk <hugo.levy--falk@supelec.fr>
Date: Tue, 20 Mar 2018 20:07:57 +0100
Subject: [PATCH] fixe la migration de preferences

---
 .../migrations/0030_merge_20180320_1419.py       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 preferences/migrations/0030_merge_20180320_1419.py

diff --git a/preferences/migrations/0030_merge_20180320_1419.py b/preferences/migrations/0030_merge_20180320_1419.py
new file mode 100644
index 00000000..90d70370
--- /dev/null
+++ b/preferences/migrations/0030_merge_20180320_1419.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-03-20 13:19
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0029_auto_20180318_1005'),
+        ('preferences', '0029_auto_20180318_0213'),
+    ]
+
+    operations = [
+    ]