kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-30 07:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'alembic branches' merge conflict as described by the web page.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@411191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-03-26 16:03:24 +00:00
parent c90a39b6b8
commit a90c190c87
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py
View File

@@ -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