From 6ad36b274b9b035edcf856f1036dab0806c90951 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Thu, 25 May 2017 13:46:03 +0100 Subject: [PATCH] Fix merge conflict with migration file --- ...d_notifications.py => 0087_scheduled_notifications.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0086_scheduled_notifications.py => 0087_scheduled_notifications.py} (85%) diff --git a/migrations/versions/0086_scheduled_notifications.py b/migrations/versions/0087_scheduled_notifications.py similarity index 85% rename from migrations/versions/0086_scheduled_notifications.py rename to migrations/versions/0087_scheduled_notifications.py index 58e1d5a55..9066e8ac1 100644 --- a/migrations/versions/0086_scheduled_notifications.py +++ b/migrations/versions/0087_scheduled_notifications.py @@ -1,7 +1,7 @@ """empty message -Revision ID: 0086_scheduled_notifications -Revises: 0085_update_incoming_to_inbound +Revision ID: 0087_scheduled_notifications +Revises: 0086_add_norm_to_notification Create Date: 2017-05-15 12:50:20.041950 """ @@ -9,8 +9,8 @@ from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql -revision = '0086_scheduled_notifications' -down_revision = '0085_update_incoming_to_inbound' +revision = '0087_scheduled_notifications' +down_revision = '0086_add_norm_to_notification' def upgrade():