[asterisk-commits] oej: branch oej/bufo-manager-setvar r287545 - in /team/oej/bufo-manager-setva...

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Sep 19 15:04:58 2010
New Revision: 287545

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287545
Log:
Resolving conflict

Modified:
    team/oej/bufo-manager-setvar/   (props changed)
    team/oej/bufo-manager-setvar/main/manager.c

Propchange: team/oej/bufo-manager-setvar/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Sep 19 15:04:58 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-287419
+/branches/1.4:1-287544

Modified: team/oej/bufo-manager-setvar/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/bufo-manager-setvar/main/manager.c?view=diff&rev=287545&r1=287544&r2=287545
==============================================================================
--- team/oej/bufo-manager-setvar/main/manager.c (original)
+++ team/oej/bufo-manager-setvar/main/manager.c Sun Sep 19 15:04:58 2010
@@ -2075,6 +2075,7 @@
 			}
 		}
 	}
+
 	if (ast_true(async)) {
 		struct fast_originate_helper *fast = ast_calloc(1, sizeof(*fast));
 		if (!fast) {