From 3b28a1fa47d4e2339f2219eaf688b88b5901afea Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Tue, 25 Apr 2017 10:19:57 +0100
Subject: [PATCH] Fix db migration merge conflicts

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

diff --git a/migrations/versions/0074_update_sms_rate.py b/migrations/versions/0074_update_sms_rate.py
index 319ca0dcd..7a5a0728a 100644
--- a/migrations/versions/0074_update_sms_rate.py
+++ b/migrations/versions/0074_update_sms_rate.py
@@ -1,7 +1,7 @@
 """empty message
 
 Revision ID: 0074_update_sms_rate
-Revises: 0072_add_dvla_orgs
+Revises: 0073_add_international_sms_flag
 Create Date: 2017-04-24 12:10:02.116278
 
 """
@@ -9,7 +9,7 @@ Create Date: 2017-04-24 12:10:02.116278
 import uuid
 
 revision = '0074_update_sms_rate'
-down_revision = '0072_add_dvla_orgs'
+down_revision = '0073_add_international_sms_flag'
 
 from alembic import op