[asterisk-commits] branch oej/jitterbuffer r10734 - /team/oej/jitterbuffer/channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Feb 22 11:13:26 2006
New Revision: 10734

URL: http://svn.digium.com/view/asterisk?rev=10734&view=rev
Log:
Fix found in the test-this-branch branch. Guess no one tested this branch
with zap....

Modified:
    team/oej/jitterbuffer/channels/chan_zap.c

Modified: team/oej/jitterbuffer/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/oej/jitterbuffer/channels/chan_zap.c?rev=10734&r1=10733&r2=10734&view=diff
==============================================================================
--- team/oej/jitterbuffer/channels/chan_zap.c (original)
+++ team/oej/jitterbuffer/channels/chan_zap.c Wed Feb 22 11:13:26 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 */