Blocked revisions 405587
authorJonathan Rose <jrose@digium.com>
Wed, 15 Jan 2014 16:49:17 +0000 (16:49 +0000)
committerJonathan Rose <jrose@digium.com>
Wed, 15 Jan 2014 16:49:17 +0000 (16:49 +0000)
commit3e499ccd563f7de45a67e079910f1f62bffeae51
tree48a1db8d8f90e1326766bd1e14698eb5679fbbb7
parent8ba05ae67ef7436ff5478850b29888f211c417af
Blocked revisions 405587

........
Remove subversion conflict tag accidentally left in CHANGES

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405588 65c4cc65-6c06-0410-ace0-fbb531ad65f3