[svn-commits] oej: branch oej/pinetree-1.4 r203600 - /team/oej/pinetree-1.4/res/res_features.c

[SVN commits to the Digium repositories]

Author: oej
Date: Fri Jun 26 06:35:25 2009
New Revision: 203600

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203600
Log:
Resolving stuff, old conflicts.

Modified:
    team/oej/pinetree-1.4/res/res_features.c

Modified: team/oej/pinetree-1.4/res/res_features.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/oej/pinetree-1.4/res/res_features.c?view=diff&rev=203600&r1=203599&r2=203600
==============================================================================
--- team/oej/pinetree-1.4/res/res_features.c (original)
+++ team/oej/pinetree-1.4/res/res_features.c Fri Jun 26 06:35:25 2009
@@ -1734,7 +1734,6 @@
 			ast_set_flag(chan_cdr, AST_CDR_FLAG_MAIN);
 			ast_cdr_update(chan);
 			bridge_cdr = ast_cdr_dup(chan_cdr);
-
 			/* rip any forked CDR's off of the chan_cdr and attach
 			 * them to the bridge_cdr instead */
 			bridge_cdr->next = chan_cdr->next;