Fix merge conflict

This commit is contained in:
Rebecca Law
2017-11-23 13:46:14 +00:00
parent a19cb66590
commit 80db78e7a5

View File

@@ -1,7 +1,7 @@
"""
Revision ID: 0144_add_notification_reply_to
Revises: 0143_remove_reply_to
Revision ID: 0145_add_notification_reply_to
Revises: 0144_template_service_letter
Create Date: 2017-11-22 14:23:48.806781
"""
@@ -9,8 +9,8 @@ from alembic import op
import sqlalchemy as sa
revision = '0144_add_notification_reply_to'
down_revision = '0143_remove_reply_to'
revision = '0145_add_notification_reply_to'
down_revision = '0144_template_service_letter'
def upgrade():