From eb87f17d2e334298e2066c7933e8b39354825f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 31 May 2016 13:54:29 +0200
Subject: [PATCH] Fix migrations between master and stable

---
 .../migrations/0044_auto_20160531_1150.py     | 20 +++++++++++++++++++
 taiga/projects/migrations/0044_merge.py       | 16 ---------------
 2 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 taiga/projects/migrations/0044_auto_20160531_1150.py
 delete mode 100644 taiga/projects/migrations/0044_merge.py

diff --git a/taiga/projects/migrations/0044_auto_20160531_1150.py b/taiga/projects/migrations/0044_auto_20160531_1150.py
new file mode 100644
index 00000000..67df71a5
--- /dev/null
+++ b/taiga/projects/migrations/0044_auto_20160531_1150.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.2 on 2016-05-31 11:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0043_auto_20160530_1004'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='blocked_code',
+            field=models.CharField(blank=True, choices=[('blocked-by-nonpayment', 'This project is blocked due to payment failure'), ('blocked-by-staff', 'This project is blocked by admin staff'), ('blocked-by-owner-leaving', 'This project is blocked because the owner left'), ('blocked-by-deleting', "This project is blocked while it's deleted")], default=None, max_length=255, null=True, verbose_name='blocked code'),
+        ),
+    ]
diff --git a/taiga/projects/migrations/0044_merge.py b/taiga/projects/migrations/0044_merge.py
deleted file mode 100644
index 6bf0227c..00000000
--- a/taiga/projects/migrations/0044_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-05-30 16:36
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('projects', '0043_auto_20160530_1004'),
-        ('projects', '0042_auto_20160525_0911'),
-    ]
-
-    operations = [
-    ]