mirror of
https://github.com/GSA/notifications-api.git
synced 2026-01-31 15:15:38 -05:00
Fix merge conflicts in tests.
Update new migrations scripts to fix conflict in with script names.
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
"""empty message
|
||||
|
||||
Revision ID: 0049_set_job_status
|
||||
Revises: 0048_job_scheduled_time
|
||||
Revision ID: 0051_set_job_status
|
||||
Revises: 0050_index_for_stats
|
||||
Create Date: 2016-08-24 13:21:51.744526
|
||||
|
||||
"""
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '0049_set_job_status'
|
||||
down_revision = '0048_job_scheduled_time'
|
||||
revision = '0051_set_job_status'
|
||||
down_revision = '0050_index_for_stats'
|
||||
|
||||
from alembic import op
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
"""empty message
|
||||
|
||||
Revision ID: 0050_drop_jobs_status
|
||||
Revises: 0049_set_job_status
|
||||
Revision ID: 0052_drop_jobs_status
|
||||
Revises: 0051_set_job_status
|
||||
Create Date: 2016-08-25 15:56:31.779399
|
||||
|
||||
"""
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '0050_drop_jobs_status'
|
||||
down_revision = '0049_set_job_status'
|
||||
revision = '0052_drop_jobs_status'
|
||||
down_revision = '0051_set_job_status'
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
Reference in New Issue
Block a user