diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-03-26 16:05:00 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-03-26 16:05:00 +0000 |
| commit | 4b18b3bb4d68217b1d69f8cee848ab89691f4a73 (patch) | |
| tree | 0fcb0ecd886416cf385206539762247f6d923e24 /contrib | |
| parent | c32fe8b8e50f9b494bddc2bb63cd2bb1ed02ba57 (diff) | |
Fix 'alembic branches' merge conflict as described by the web page.
........
Merged revisions 411191 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py | 2 |
1 files changed, 1 insertions, 1 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 2c89bc2b8..aefddd12e 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,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 """ |