From 8673da18742fea41d8902f45170089cdc6fd5a87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@gmail.com>
Date: Tue, 24 Oct 2017 16:51:54 +0200
Subject: [PATCH] Fix migration conflict

---
 .../{0058_amend_supplier.py => 0060_amend_supplier.py}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename kfet/migrations/{0058_amend_supplier.py => 0060_amend_supplier.py} (96%)

diff --git a/kfet/migrations/0058_amend_supplier.py b/kfet/migrations/0060_amend_supplier.py
similarity index 96%
rename from kfet/migrations/0058_amend_supplier.py
rename to kfet/migrations/0060_amend_supplier.py
index 764322b0..4eb569f8 100644
--- a/kfet/migrations/0058_amend_supplier.py
+++ b/kfet/migrations/0060_amend_supplier.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('kfet', '0057_merge'),
+        ('kfet', '0059_create_generic'),
     ]
 
     operations = [