From 9b58fc1829b075d67f30ed27806ac48c5dc05b59 Mon Sep 17 00:00:00 2001
From: Hugo LEVY-FALK <hugo.levy--falk@supelec.fr>
Date: Wed, 15 Aug 2018 22:02:39 +0200
Subject: [PATCH] fix migrations

---
 users/migrations/0075_merge_20180815_2202.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 users/migrations/0075_merge_20180815_2202.py

diff --git a/users/migrations/0075_merge_20180815_2202.py b/users/migrations/0075_merge_20180815_2202.py
new file mode 100644
index 00000000..c24ebf4e
--- /dev/null
+++ b/users/migrations/0075_merge_20180815_2202.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-08-15 20:02
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0074_auto_20180814_1059'),
+        ('users', '0074_auto_20180810_2104'),
+    ]
+
+    operations = [
+    ]