Remove subversion conflict tag accidentally left in CHANGES

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

diff --git a/CHANGES b/CHANGES
index 000390c8913df03e86eea58f09149485540406ea..51b71915acc8ad7003de887bd16eab1aa38ecb6b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -24,7 +24,6 @@ chan_pjsip
    and aor sections.
 
 ------------------------------------------------------------------------------
->>>>>>> .r405584
 --- Functionality changes from Asterisk 11 to Asterisk 12 --------------------
 ------------------------------------------------------------------------------