From 1bfc22bbb51b42b82a11f0b4e5cc3f3354dec224 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 20 Nov 2017 17:05:46 +0000 Subject: [PATCH] Fix merge conflict for db migration --- .../{0142_remove_reply_to.py => 0143_remove_reply_to.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0142_remove_reply_to.py => 0143_remove_reply_to.py} (85%) diff --git a/migrations/versions/0142_remove_reply_to.py b/migrations/versions/0143_remove_reply_to.py similarity index 85% rename from migrations/versions/0142_remove_reply_to.py rename to migrations/versions/0143_remove_reply_to.py index 43cf510d9..9e7f2413b 100644 --- a/migrations/versions/0142_remove_reply_to.py +++ b/migrations/versions/0143_remove_reply_to.py @@ -1,7 +1,7 @@ """ -Revision ID: 0142_remove_reply_to -Revises: 0141_remove_unused +Revision ID: 0143_remove_reply_to +Revises: 0142_validate_constraint Create Date: 2017-11-20 14:35:16.826398 """ @@ -9,8 +9,8 @@ from alembic import op import sqlalchemy as sa -revision = '0142_remove_reply_to' -down_revision = '0141_remove_unused' +revision = '0143_remove_reply_to' +down_revision = '0142_validate_constraint' def upgrade():