From bcd8d8556943b5ea9dbb72a11033ffae44c6e234 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 21 Jun 2021 13:34:06 +0100 Subject: [PATCH] Fix merge conflicts --- ...ifications_.py => 0359_remove_sched_notifications_.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0358_remove_sched_notifications_.py => 0359_remove_sched_notifications_.py} (89%) diff --git a/migrations/versions/0358_remove_sched_notifications_.py b/migrations/versions/0359_remove_sched_notifications_.py similarity index 89% rename from migrations/versions/0358_remove_sched_notifications_.py rename to migrations/versions/0359_remove_sched_notifications_.py index 6e629db21..3046d3dfb 100644 --- a/migrations/versions/0358_remove_sched_notifications_.py +++ b/migrations/versions/0359_remove_sched_notifications_.py @@ -1,7 +1,7 @@ """ -Revision ID: 0358_remove_sched_notifications -Revises: 0357_validate_constraint +Revision ID: 0359_remove_sched_notifications +Revises: 0358_operator_channel Create Date: 2021-06-07 09:09:06.376862 """ @@ -9,8 +9,8 @@ import sqlalchemy as sa from alembic import op from sqlalchemy.dialects import postgresql -revision = '0358_remove_sched_notifications' -down_revision = '0357_validate_constraint' +revision = '0359_remove_sched_notifications' +down_revision = '0358_operator_channel' def upgrade():