From: Jonathan Rose <jrose@digium.com>
Date: Wed, 15 Jan 2014 16:48:47 +0000 (+0000)
Subject: Remove subversion conflict tag accidentally left in CHANGES
X-Git-Tag: 12.1.0-rc1~3^2~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16e03f0b08b93a199b8bab6fe4361057a3321896;p=thirdparty%2Fasterisk.git

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 000390c891..51b71915ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,7 +24,6 @@ chan_pjsip
    and aor sections.
 
 ------------------------------------------------------------------------------
->>>>>>> .r405584
 --- Functionality changes from Asterisk 11 to Asterisk 12 --------------------
 ------------------------------------------------------------------------------