From 3c15b0ab1a7b3b8dd3df124bd687c024e8ee28a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Mon, 30 May 2016 18:39:10 +0200
Subject: [PATCH] Create a merge migration to fix the problem between master
 and stable branches

---
 taiga/projects/migrations/0044_merge.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 taiga/projects/migrations/0044_merge.py

diff --git a/taiga/projects/migrations/0044_merge.py b/taiga/projects/migrations/0044_merge.py
new file mode 100644
index 00000000..6bf0227c
--- /dev/null
+++ b/taiga/projects/migrations/0044_merge.py
@@ -0,0 +1,16 @@
+# -*- 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 = [
+    ]