[asterisk-commits] rmudgett: branch 12 r411191 - /branches/12/contrib/ast-db-manage/config/versi...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Mar 26 11:03:24 2014
New Revision: 411191

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=411191
Log:
Fix 'alembic branches' merge conflict as described by the web page.

Modified:
    branches/12/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py

Modified: branches/12/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
URL: http://svnview.digium.com/svn/asterisk/branches/12/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py?view=diff&rev=411191&r1=411190&r2=411191
==============================================================================
--- branches/12/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py (original)
+++ branches/12/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py Wed Mar 26 11:03:24 2014
@@ -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