[asterisk-commits] branch oej/test-this-branch r10730 - /team/oej/test-this-branch/channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Feb 22 11:02:29 2006
New Revision: 10730

URL: http://svn.digium.com/view/asterisk?rev=10730&view=rev
Log:
Ooooops. Thanks Saul Diaz for reporting this.

Modified:
    team/oej/test-this-branch/channels/chan_zap.c

Modified: team/oej/test-this-branch/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_zap.c?rev=10730&r1=10729&r2=10730&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_zap.c (original)
+++ team/oej/test-this-branch/channels/chan_zap.c Wed Feb 22 11:02:29 2006
@@ -107,7 +107,6 @@
 #define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
 #endif
 
-<<<<<<< .working
 #ifdef AST_JB
 #include "asterisk/abstract_jb.h"
 /* Global jitterbuffer configuration - by default, jb is disabled */