From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 7 Sep 2016 14:03:12 +0000 (+0200)
Subject: Add merged migration
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=172cf1036bccc7be5e4c3a0de4c82e54d5d897c4;p=mezzo.git

Add merged migration
---

diff --git a/app/organization/projects/migrations/0006_merge.py b/app/organization/projects/migrations/0006_merge.py
new file mode 100644
index 00000000..134db2dc
--- /dev/null
+++ b/app/organization/projects/migrations/0006_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-07 14:02
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-projects', '0005_auto_20160907_1046'),
+        ('organization-projects', '0005_auto_20160907_1138'),
+    ]
+
+    operations = [
+    ]