[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r399096 - /team/rmudgett/bridge_phase/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 13 13:27:01 2013
New Revision: 399096

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399096
Log:
Remove a blank line to prevent conflict.

Modified:
    team/rmudgett/bridge_phase/res/stasis/control.c

Modified: team/rmudgett/bridge_phase/res/stasis/control.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/res/stasis/control.c?view=diff&rev=399096&r1=399095&r2=399096
==============================================================================
--- team/rmudgett/bridge_phase/res/stasis/control.c (original)
+++ team/rmudgett/bridge_phase/res/stasis/control.c Fri Sep 13 13:27:01 2013
@@ -569,7 +569,6 @@
 			NULL, /* swap channel */
 			NULL, /* features */
 			AST_BRIDGE_IMPART_CHAN_DEPARTABLE);
-
 		if (res != 0) {
 			ast_log(LOG_ERROR, "Error adding channel to bridge\n");
 			ast_channel_pbx_set(chan, control->pbx);