From 76f24c885008b7b8173e7ee820d0364c7448e4bd Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Fri, 4 Oct 2019 10:12:39 +0200
Subject: [PATCH] Migration updates after rebase.

---
 .../migrations/0004_rename_meta_categories_to_meta_terms.py     | 2 +-
 ...ta_terms.py => 0070_rename_meta_categories_to_meta_terms.py} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename opentech/apply/funds/migrations/{0068_rename_meta_categories_to_meta_terms.py => 0070_rename_meta_categories_to_meta_terms.py} (90%)

diff --git a/opentech/apply/categories/migrations/0004_rename_meta_categories_to_meta_terms.py b/opentech/apply/categories/migrations/0004_rename_meta_categories_to_meta_terms.py
index 8802ab2cf..75b2953dd 100644
--- a/opentech/apply/categories/migrations/0004_rename_meta_categories_to_meta_terms.py
+++ b/opentech/apply/categories/migrations/0004_rename_meta_categories_to_meta_terms.py
@@ -7,7 +7,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('categories', '0003_rename_meta_categories_to_meta_terms'),
-        ('funds', '0068_rename_meta_categories_to_meta_terms'),
+        ('funds', '0070_rename_meta_categories_to_meta_terms'),
     ]
 
     operations = [
diff --git a/opentech/apply/funds/migrations/0068_rename_meta_categories_to_meta_terms.py b/opentech/apply/funds/migrations/0070_rename_meta_categories_to_meta_terms.py
similarity index 90%
rename from opentech/apply/funds/migrations/0068_rename_meta_categories_to_meta_terms.py
rename to opentech/apply/funds/migrations/0070_rename_meta_categories_to_meta_terms.py
index be710aba4..44e7746dc 100644
--- a/opentech/apply/funds/migrations/0068_rename_meta_categories_to_meta_terms.py
+++ b/opentech/apply/funds/migrations/0070_rename_meta_categories_to_meta_terms.py
@@ -7,7 +7,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('categories', '0003_rename_meta_categories_to_meta_terms'),
-        ('funds', '0067_data_migration_for_one_form_per_stage'),
+        ('funds', '0069_merge_20190905_0403'),
     ]
 
     operations = [
-- 
GitLab