Fix merge conflicts

This commit is contained in:
Rebecca Law
2018-08-23 15:04:44 +01:00
parent 4fe1e6bb66
commit 6c5e60f0a9

View File

@@ -1,15 +1,15 @@
""" """
Revision ID: 0214_email_brand_type Revision ID: 0215_email_brand_type
Revises: 0213_brand_colour_domain Revises: 0214_another_letter_org
Create Date: 2018-08-23 11:48:00.800968 Create Date: 2018-08-23 11:48:00.800968
""" """
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
revision = '0214_email_brand_type' revision = '0215_email_brand_type'
down_revision = '0213_brand_colour_domain' down_revision = '0214_another_letter_org'
def upgrade(): def upgrade():