From d975f30888f34ae87a8455a06f43e15de37a0093 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Thu, 19 Oct 2017 14:39:53 +0100 Subject: [PATCH] Fix merge conflict --- ...que_constraint.py => 0127_remove_unique_constraint.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0126_remove_unique_constraint.py => 0127_remove_unique_constraint.py} (76%) diff --git a/migrations/versions/0126_remove_unique_constraint.py b/migrations/versions/0127_remove_unique_constraint.py similarity index 76% rename from migrations/versions/0126_remove_unique_constraint.py rename to migrations/versions/0127_remove_unique_constraint.py index ca7ec8ca2..2db71b9ea 100644 --- a/migrations/versions/0126_remove_unique_constraint.py +++ b/migrations/versions/0127_remove_unique_constraint.py @@ -1,15 +1,15 @@ """ -Revision ID: 0126_remove_unique_constraint -Revises: 0125_add_organisation_type +Revision ID: 0127_remove_unique_constraint +Revises: 0126_add_annual_billing Create Date: 2017-10-17 16:47:37.826333 """ from alembic import op import sqlalchemy as sa -revision = '0126_remove_unique_constraint' -down_revision = '0125_add_organisation_type' +revision = '0127_remove_unique_constraint' +down_revision = '0126_add_annual_billing' def upgrade():