From 24b9e7b05939f6ab1f1e4a4aecf38475a2c126a1 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 20 Jun 2017 10:56:50 +0100 Subject: [PATCH] Unpick migration conflict Inbound provider and Dial-a-Ride migrations happened at the same time and got the same revision numbers. This commit puts DAR after inbound provider. --- migrations/versions/{0098_tfl_dar.py => 0099_tfl_dar.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0098_tfl_dar.py => 0099_tfl_dar.py} (79%) diff --git a/migrations/versions/0098_tfl_dar.py b/migrations/versions/0099_tfl_dar.py similarity index 79% rename from migrations/versions/0098_tfl_dar.py rename to migrations/versions/0099_tfl_dar.py index 025e8a6fd..0f52ec9e4 100644 --- a/migrations/versions/0098_tfl_dar.py +++ b/migrations/versions/0099_tfl_dar.py @@ -1,14 +1,14 @@ """empty message -Revision ID: 0098_tfl_dar -Revises: 0097_notnull_inbound_provider +Revision ID: 0099_tfl_dar +Revises: 0098_service_inbound_api Create Date: 2017-06-05 16:15:17.744908 """ # revision identifiers, used by Alembic. -revision = '0098_tfl_dar' -down_revision = '0097_notnull_inbound_provider' +revision = '0099_tfl_dar' +down_revision = '0098_service_inbound_api' from alembic import op import sqlalchemy as sa