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 /UPGRADE-1.4.txt | |
| 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 'UPGRADE-1.4.txt')
0 files changed, 0 insertions, 0 deletions