[asterisk-commits] jrose: branch 12 r405587 - /branches/12/CHANGES

[SVN commits to the Asterisk project]

Author: jrose
Date: Wed Jan 15 10:48:47 2014
New Revision: 405587

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405587
Log:
Remove subversion conflict tag accidentally left in CHANGES

Modified:
    branches/12/CHANGES

Modified: branches/12/CHANGES
URL: http://svnview.digium.com/svn/asterisk/branches/12/CHANGES?view=diff&rev=405587&r1=405586&r2=405587
==============================================================================
--- branches/12/CHANGES (original)
+++ branches/12/CHANGES Wed Jan 15 10:48:47 2014
@@ -24,7 +24,6 @@
    and aor sections.
 
 ------------------------------------------------------------------------------
->>>>>>> .r405584
 --- Functionality changes from Asterisk 11 to Asterisk 12 --------------------
 ------------------------------------------------------------------------------