[asterisk-commits] qwell: branch qwell/queue_events r390860 - /team/qwell/queue_events/CHANGES

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jun  7 11:20:18 2013
New Revision: 390860

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390860
Log:
Fix merge resolution failure.

Modified:
    team/qwell/queue_events/CHANGES

Modified: team/qwell/queue_events/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/qwell/queue_events/CHANGES?view=diff&rev=390860&r1=390859&r2=390860
==============================================================================
--- team/qwell/queue_events/CHANGES (original)
+++ team/qwell/queue_events/CHANGES Fri Jun  7 11:20:18 2013
@@ -111,7 +111,6 @@
    information about each channel.  The (infamous) "Join" and "Leave" AMI
    events have been changed to "QueueCallerJoin" and "QueueCallerLeave".
 
-=======
 AGI (Asterisk Gateway Interface)
 ------------------
  * The manager event AGIExec has been split into AGIExecStart and AGIExecEnd.