From 25fa034e80f3f268c3e6f3c0300df3e86cd15d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Mon, 9 Mar 2015 16:22:46 +0100
Subject: [PATCH] Fix a conflict between migrations

---
 .../{0017_auto_20150219_1606.py => 0018_auto_20150219_1606.py}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename taiga/projects/migrations/{0017_auto_20150219_1606.py => 0018_auto_20150219_1606.py} (94%)

diff --git a/taiga/projects/migrations/0017_auto_20150219_1606.py b/taiga/projects/migrations/0018_auto_20150219_1606.py
similarity index 94%
rename from taiga/projects/migrations/0017_auto_20150219_1606.py
rename to taiga/projects/migrations/0018_auto_20150219_1606.py
index f891db4f..a5f326b4 100644
--- a/taiga/projects/migrations/0017_auto_20150219_1606.py
+++ b/taiga/projects/migrations/0018_auto_20150219_1606.py
@@ -7,7 +7,7 @@ from django.db import models, migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('projects', '0016_fix_json_field_not_null'),
+        ('projects', '0017_fix_is_private_for_projects'),
     ]
 
     operations = [