[asterisk-commits] file: branch file/bridging-phase2 r180454 - /team/file/bridging-phase2/bridges/

[SVN commits to the Asterisk project]

Author: file
Date: Thu Mar  5 13:41:40 2009
New Revision: 180454

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180454
Log:
Remove a stray conflict.

Modified:
    team/file/bridging-phase2/bridges/bridge_multiplexed.c

Modified: team/file/bridging-phase2/bridges/bridge_multiplexed.c
URL: http://svn.digium.com/svn-view/asterisk/team/file/bridging-phase2/bridges/bridge_multiplexed.c?view=diff&rev=180454&r1=180453&r2=180454
==============================================================================
--- team/file/bridging-phase2/bridges/bridge_multiplexed.c (original)
+++ team/file/bridging-phase2/bridges/bridge_multiplexed.c Thu Mar  5 13:41:40 2009
@@ -147,7 +147,6 @@
 			ao2_unlock(multiplexed_threads);
 			return -1;
 		}
-<<<<<<< .working
 
 		multiplexed_thread->pipe[0] = multiplexed_thread->pipe[1] = -1;
 		/* Setup a pipe so we can poke the thread itself when needed */