[asterisk-commits] rmudgett: trunk r411192 - in /trunk: ./ contrib/ast-db-manage/config/versions/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Mar 26 11:05:00 2014
New Revision: 411192

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

Merged revisions 411191 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py?view=diff&rev=411192&r1=411191&r2=411192
==============================================================================
--- trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py (original)
+++ trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py Wed Mar 26 11:05:00 2014
@@ -1,7 +1,7 @@
 """Fix tos and cos field types
 
 Revision ID: 4c573e7135bd
-Revises: 21e526ad3040
+Revises: 28887f25a46f
 Create Date: 2014-03-05 12:16:56.618630
 
 """