Fix data migration merge conflict

This commit is contained in:
Rebecca Law
2017-07-19 15:47:12 +01:00
parent bc4afb25ae
commit 793248a74f

View File

@@ -1,14 +1,14 @@
"""empty message
Revision ID: 0109_monthly_billing
Revises: 0108_change_logo_not_nullable
Revision ID: 0110_monthly_billing
Revises: 0109_rem_old_noti_status
Create Date: 2017-07-13 14:35:03.183659
"""
# revision identifiers, used by Alembic.
revision = '0109_monthly_billing'
down_revision = '0108_change_logo_not_nullable'
revision = '0110_monthly_billing'
down_revision = '0109_rem_old_noti_status'
from alembic import op
import sqlalchemy as sa