Fix db migration merge conflicts

This commit is contained in:
Rebecca Law
2021-02-26 08:38:36 +00:00
parent 3099c51e12
commit e105257925

View File

@@ -1,7 +1,7 @@
""" """
Revision ID: 0348_add_ft_processing_time Revision ID: 0349_add_ft_processing_time
Revises: 0347_add_dvla_volumes_template Revises: 0348_migrate_broadcast_settings
Create Date: 2021-02-22 14:05:24.775338 Create Date: 2021-02-22 14:05:24.775338
""" """
@@ -9,8 +9,8 @@ from alembic import op
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy.dialects import postgresql from sqlalchemy.dialects import postgresql
revision = '0348_add_ft_processing_time' revision = '0349_add_ft_processing_time'
down_revision = '0347_add_dvla_volumes_template' down_revision = '0348_migrate_broadcast_settings'
def upgrade(): def upgrade():