From 649c012b6d71fbf1010cddcb126e8026d7095f45 Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Mon, 12 Feb 2018 16:27:49 +0000
Subject: [PATCH] Resolve migration conflicts
---
.../{0016_add_addressfield.py => 0018_add_addressfield.py} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename opentech/apply/funds/migrations/{0016_add_addressfield.py => 0018_add_addressfield.py} (99%)
diff --git a/opentech/apply/funds/migrations/0016_add_addressfield.py b/opentech/apply/funds/migrations/0018_add_addressfield.py
similarity index 99%
rename from opentech/apply/funds/migrations/0016_add_addressfield.py
rename to opentech/apply/funds/migrations/0018_add_addressfield.py
index 377d719ab..4e0b050b2 100644
--- a/opentech/apply/funds/migrations/0016_add_addressfield.py
+++ b/opentech/apply/funds/migrations/0018_add_addressfield.py
@@ -12,7 +12,7 @@ import wagtail.wagtailcore.fields
class Migration(migrations.Migration):
dependencies = [
- ('funds', '0015_link_user_to_application'),
+ ('funds', '0017_round_workflow'),
]
operations = [
--
GitLab