From 56d7a7242b97f13650f49b97e0b50b96c348270e Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Mon, 14 May 2018 09:49:24 +0100
Subject: [PATCH] Fix merge conflict in db migration

---
 migrations/versions/0189_ft_billing_data_type.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/migrations/versions/0189_ft_billing_data_type.py b/migrations/versions/0189_ft_billing_data_type.py
index 951583ad6..e18714f8b 100644
--- a/migrations/versions/0189_ft_billing_data_type.py
+++ b/migrations/versions/0189_ft_billing_data_type.py
@@ -1,7 +1,7 @@
 """
 
 Revision ID: 0189_ft_billing_data_type
-Revises: 0187_another_letter_org
+Revises: 0188_add_ft_notification_status
 Create Date: 2018-05-10 14:57:52.589773
 
 """
@@ -9,7 +9,7 @@ from alembic import op
 import sqlalchemy as sa
 
 revision = '0189_ft_billing_data_type'
-down_revision = '0187_another_letter_org'
+down_revision = '0188_add_ft_notification_status'
 
 
 def upgrade():