From 6f1841599757612b05bbc03c476a2799a7002e3c Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 14 Aug 2017 13:54:18 +0100 Subject: [PATCH] Fix order of DB migrations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit More migrations got merged in between me making 0114 and merging the PR that contained 0114. If we named the files as just 0114.py then this would get flagged as a merge conflict… --- ...4_another_letter_org.py => 0116_another_letter_org.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0114_another_letter_org.py => 0116_another_letter_org.py} (66%) diff --git a/migrations/versions/0114_another_letter_org.py b/migrations/versions/0116_another_letter_org.py similarity index 66% rename from migrations/versions/0114_another_letter_org.py rename to migrations/versions/0116_another_letter_org.py index fe12fbe82..f3fca77cf 100644 --- a/migrations/versions/0114_another_letter_org.py +++ b/migrations/versions/0116_another_letter_org.py @@ -1,14 +1,14 @@ """empty message -Revision ID: 0114_another_letter_org -Revises: 0113_job_created_by_nullable +Revision ID: 0116_another_letter_org +Revises: 0115_add_inbound_numbers Create Date: 2017-06-29 12:44:16.815039 """ # revision identifiers, used by Alembic. -revision = '0114_another_letter_org' -down_revision = '0113_job_created_by_nullable' +revision = '0116_another_letter_org' +down_revision = '0115_add_inbound_numbers' from alembic import op