From a90c190c871ae352934b1c35e4ad309b1afb113b Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Wed, 26 Mar 2014 16:03:24 +0000 Subject: [PATCH] Fix 'alembic branches' merge conflict as described by the web page. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@411191 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- .../config/versions/4c573e7135bd_fix_tos_field_types.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py b/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py index 51e8fa9ca7..aefddd12eb 100755 --- a/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py +++ b/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py @@ -1,14 +1,14 @@ """Fix tos and cos field types Revision ID: 4c573e7135bd -Revises: 21e526ad3040 +Revises: 28887f25a46f Create Date: 2014-03-05 12:16:56.618630 """ # revision identifiers, used by Alembic. revision = '4c573e7135bd' -down_revision = '21e526ad3040' +down_revision = '28887f25a46f' from alembic import op from alembic import context -- 2.47.2