From e4cc90e5852181f3c10c330811a6408e6555e83a Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Tue, 10 Jul 2018 15:49:36 +0100 Subject: [PATCH] Fix merge conflict --- ...e_data_retention.py => 0204_service_data_retention.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0202_service_data_retention.py => 0204_service_data_retention.py} (88%) diff --git a/migrations/versions/0202_service_data_retention.py b/migrations/versions/0204_service_data_retention.py similarity index 88% rename from migrations/versions/0202_service_data_retention.py rename to migrations/versions/0204_service_data_retention.py index 438c78fce..76fb3d7b6 100644 --- a/migrations/versions/0202_service_data_retention.py +++ b/migrations/versions/0204_service_data_retention.py @@ -1,7 +1,7 @@ """ -Revision ID: 0202_service_data_retention -Revises: 0201_another_letter_org +Revision ID: 0204_service_data_retention +Revises: 0203_fix_old_incomplete_jobs Create Date: 2018-07-10 11:22:01.761829 """ @@ -9,8 +9,8 @@ from alembic import op import sqlalchemy as sa from sqlalchemy.dialects import postgresql -revision = '0202_service_data_retention' -down_revision = '0201_another_letter_org' +revision = '0204_service_data_retention' +down_revision = '0203_fix_old_incomplete_jobs' def upgrade():