Fix merge conflicts for the db migration file.

Update test_services_dao to stop using fixtures. This is a massive change. The only real change in the file is to check for the letter_class.
This commit is contained in:
Rebecca Law
2018-09-17 15:45:29 +01:00
parent 79815b4f8a
commit efb618e956
3 changed files with 374 additions and 402 deletions

View File

@@ -1,7 +1,7 @@
"""
Revision ID: 0225_letter_class
Revises: 0224_returned_letter_status
Revision ID: 0226_letter_class
Revises: 0225_another_letter_org
Create Date: 2018-09-13 16:23:59.168877
"""
@@ -9,8 +9,8 @@ from alembic import op
import sqlalchemy as sa
revision = '0225_letter_class'
down_revision = '0224_returned_letter_status'
revision = '0226_letter_class'
down_revision = '0225_another_letter_org'
def upgrade():