From bdd918cabd119bc0d9099f3fa03762ad59f8e54a Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 16 Jan 2017 18:05:54 +0100
Subject: [PATCH] Fixed migrations conflict.

---
 .../{0003_auto_20170116_1508.py => 0005_auto_20170116_1508.py}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename modoboa/relaydomains/migrations/{0003_auto_20170116_1508.py => 0005_auto_20170116_1508.py} (90%)

diff --git a/modoboa/relaydomains/migrations/0003_auto_20170116_1508.py b/modoboa/relaydomains/migrations/0005_auto_20170116_1508.py
similarity index 90%
rename from modoboa/relaydomains/migrations/0003_auto_20170116_1508.py
rename to modoboa/relaydomains/migrations/0005_auto_20170116_1508.py
index 19c94ce5b..4b11f3c83 100644
--- a/modoboa/relaydomains/migrations/0003_auto_20170116_1508.py
+++ b/modoboa/relaydomains/migrations/0005_auto_20170116_1508.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('relaydomains', '0002_migrate_from_modoboa_admin_relaydomains'),
+        ('relaydomains', '0004_auto_20161105_1426'),
     ]
 
     operations = [