From c65ddba1d6bbe8c776e72a32f69d655cd89825e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@gmail.com>
Date: Thu, 12 Oct 2017 00:04:06 +0200
Subject: [PATCH] Fix and merge kfet migrations

---
 kfet/migrations/0048_generic_profiles.py      |  7 ++++++-
 .../0049_rename_cofprofile_profile.py         | 19 -------------------
 2 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 kfet/migrations/0049_rename_cofprofile_profile.py

diff --git a/kfet/migrations/0048_generic_profiles.py b/kfet/migrations/0048_generic_profiles.py
index ef5eae4e..260f5ce0 100644
--- a/kfet/migrations/0048_generic_profiles.py
+++ b/kfet/migrations/0048_generic_profiles.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cof', '0009_generic_profiles'),
+        ('cof', '0009_move_profile'),
         ('kfet', '0047_auto_20170104_1528'),
     ]
 
@@ -20,4 +20,9 @@ class Migration(migrations.Migration):
                 on_delete=models.CASCADE,
                 related_name='account_kfet'),
         ),
+        migrations.RenameField(
+            model_name='account',
+            old_name='cofprofile',
+            new_name='profile',
+        ),
     ]
diff --git a/kfet/migrations/0049_rename_cofprofile_profile.py b/kfet/migrations/0049_rename_cofprofile_profile.py
deleted file mode 100644
index 2ca767e8..00000000
--- a/kfet/migrations/0049_rename_cofprofile_profile.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('kfet', '0048_generic_profiles'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='account',
-            old_name='cofprofile',
-            new_name='profile',
-        ),
-    ]