From 9bf1efd16aa6b1c8b812dbdb559055ec9655ad01 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 10 Jul 2017 15:44:01 +0100 Subject: [PATCH] Fix merge conflict with db migration script --- ...drop_template_stats.py => 0107_drop_template_stats.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0106_drop_template_stats.py => 0107_drop_template_stats.py} (91%) diff --git a/migrations/versions/0106_drop_template_stats.py b/migrations/versions/0107_drop_template_stats.py similarity index 91% rename from migrations/versions/0106_drop_template_stats.py rename to migrations/versions/0107_drop_template_stats.py index 0e0204359..88bf8b060 100644 --- a/migrations/versions/0106_drop_template_stats.py +++ b/migrations/versions/0107_drop_template_stats.py @@ -1,14 +1,14 @@ """empty message -Revision ID: 0106_drop_template_stats -Revises: 0105_opg_letter_org +Revision ID: 0107_drop_template_stats +Revises: 0106_null_noti_status Create Date: 2017-07-10 14:25:58.494636 """ # revision identifiers, used by Alembic. -revision = '0106_drop_template_stats' -down_revision = '0105_opg_letter_org' +revision = '0107_drop_template_stats' +down_revision = '0106_null_noti_status' from alembic import op import sqlalchemy as sa