From 435ffc918c2a2b4aa3b50b10ac4eb1f95bdb75c7 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 16 Jan 2019 11:38:03 +0100
Subject: [PATCH] Update the migrations after rebase.

---
 ...ssion_partners.py => 0049_applicationsubmission_partners.py} | 2 +-
 .../{0008_add_partner_group.py => 0009_add_partner_group.py}    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename opentech/apply/funds/migrations/{0048_applicationsubmission_partners.py => 0049_applicationsubmission_partners.py} (91%)
 rename opentech/apply/users/migrations/{0008_add_partner_group.py => 0009_add_partner_group.py} (96%)

diff --git a/opentech/apply/funds/migrations/0048_applicationsubmission_partners.py b/opentech/apply/funds/migrations/0049_applicationsubmission_partners.py
similarity index 91%
rename from opentech/apply/funds/migrations/0048_applicationsubmission_partners.py
rename to opentech/apply/funds/migrations/0049_applicationsubmission_partners.py
index ace0d254d..53120f4c3 100644
--- a/opentech/apply/funds/migrations/0048_applicationsubmission_partners.py
+++ b/opentech/apply/funds/migrations/0049_applicationsubmission_partners.py
@@ -8,7 +8,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('funds', '0047_add_markdown'),
+        ('funds', '0048_add_field_slack_channel'),
     ]
 
     operations = [
diff --git a/opentech/apply/users/migrations/0008_add_partner_group.py b/opentech/apply/users/migrations/0009_add_partner_group.py
similarity index 96%
rename from opentech/apply/users/migrations/0008_add_partner_group.py
rename to opentech/apply/users/migrations/0009_add_partner_group.py
index c639f4918..6e005116f 100644
--- a/opentech/apply/users/migrations/0008_add_partner_group.py
+++ b/opentech/apply/users/migrations/0009_add_partner_group.py
@@ -34,7 +34,7 @@ def remove_groups(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('users', '0007_user_slack'),
+        ('users', '0008_add_staff_permissions'),
     ]
 
     operations = [
-- 
GitLab