From 7c44171a40d993ddf6de57c085e3ff63fa1e0658 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Fri, 23 Feb 2018 10:57:24 +0000 Subject: [PATCH] Fix merge conflict in db migration script --- ...invite_template.py => 0168_add_org_invite_template.py} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename migrations/versions/{0167_add_org_invite_template.py => 0168_add_org_invite_template.py} (93%) diff --git a/migrations/versions/0167_add_org_invite_template.py b/migrations/versions/0168_add_org_invite_template.py similarity index 93% rename from migrations/versions/0167_add_org_invite_template.py rename to migrations/versions/0168_add_org_invite_template.py index ff36fef21..1a3ced07f 100644 --- a/migrations/versions/0167_add_org_invite_template.py +++ b/migrations/versions/0168_add_org_invite_template.py @@ -1,7 +1,7 @@ """ -Revision ID: 0167_add_org_invite_template -Revises: 0166_add_org_user_stuff +Revision ID: 0168_add_org_invite_template +Revises: 0167_add_precomp_letter_svc_perm Create Date: 2018-02-16 14:16:43.618062 """ @@ -11,8 +11,8 @@ from alembic import op from flask import current_app -revision = '0167_add_org_invite_template' -down_revision = '0166_add_org_user_stuff' +revision = '0168_add_org_invite_template' +down_revision = '0167_add_precomp_letter_svc_perm' template_id = '203566f0-d835-47c5-aa06-932439c86573'