From e0ab7f5f94b5812bb69551a84ff5569305beb8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Tue, 10 Oct 2017 21:21:28 +0200
Subject: [PATCH] Fix migration conflict

---
 kfet/migrations/0057_merge.py          | 3 ++-
 kfet/migrations/0058_amend_supplier.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kfet/migrations/0057_merge.py b/kfet/migrations/0057_merge.py
index 48f63399..e3cadb23 100644
--- a/kfet/migrations/0057_merge.py
+++ b/kfet/migrations/0057_merge.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('kfet', '0057_add_perms_config'),
         ('kfet', '0056_change_account_meta'),
         ('kfet', '0054_update_promos'),
     ]
diff --git a/kfet/migrations/0058_amend_supplier.py b/kfet/migrations/0058_amend_supplier.py
index 0b45dade..764322b0 100644
--- a/kfet/migrations/0058_amend_supplier.py
+++ b/kfet/migrations/0058_amend_supplier.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('kfet', '0057_add_perms_config'),
+        ('kfet', '0057_merge'),
     ]
 
     operations = [