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)
........
Remove subversion conflict tag accidentally left in CHANGES

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


No differences found