From 793248a74f0da249bbe9e23582b00dff953919aa Mon Sep 17 00:00:00 2001
From: Rebecca Law <servingUpAces@gmail.com>
Date: Wed, 19 Jul 2017 15:47:12 +0100
Subject: [PATCH] Fix data migration merge conflict

---
 .../{0109_monthly_billing.py => 0110_monthly_billing.py}  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename migrations/versions/{0109_monthly_billing.py => 0110_monthly_billing.py} (89%)

diff --git a/migrations/versions/0109_monthly_billing.py b/migrations/versions/0110_monthly_billing.py
similarity index 89%
rename from migrations/versions/0109_monthly_billing.py
rename to migrations/versions/0110_monthly_billing.py
index 124a509cf..19b1ce4fc 100644
--- a/migrations/versions/0109_monthly_billing.py
+++ b/migrations/versions/0110_monthly_billing.py
@@ -1,14 +1,14 @@
 """empty message
 
-Revision ID: 0109_monthly_billing
-Revises: 0108_change_logo_not_nullable
+Revision ID: 0110_monthly_billing
+Revises: 0109_rem_old_noti_status
 Create Date: 2017-07-13 14:35:03.183659
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '0109_monthly_billing'
-down_revision = '0108_change_logo_not_nullable'
+revision = '0110_monthly_billing'
+down_revision = '0109_rem_old_noti_status'
 
 from alembic import op
 import sqlalchemy as sa