[asterisk-commits] dlee: branch dlee/allow-multiple r395708 - /team/dlee/allow-multiple/res/

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Jul 29 15:39:11 2013
New Revision: 395708

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395708
Log:
Fixed merge conflict

Modified:
    team/dlee/allow-multiple/res/res_ari_events.c

Modified: team/dlee/allow-multiple/res/res_ari_events.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/allow-multiple/res/res_ari_events.c?view=diff&rev=395708&r1=395707&r2=395708
==============================================================================
--- team/dlee/allow-multiple/res/res_ari_events.c (original)
+++ team/dlee/allow-multiple/res/res_ari_events.c Mon Jul 29 15:39:11 2013
@@ -76,7 +76,6 @@
 		ast_log(LOG_ERROR, "Failed to create ARI session\n");
 		goto fin;
 	}
-<<<<<<< HEAD:rest-api-templates/res_stasis_http_resource.c.mustache
 
 	for (i = get_params; i; i = i->next) {
 		if (strcmp(i->name, "app") == 0) {
@@ -117,7 +116,7 @@
 		{}
 	}
 
-	ari_websocket_event_websocket(session, headers, &args);
+	ast_ari_websocket_event_websocket(session, headers, &args);
 
 fin: __attribute__((unused))
 	if (response && response->response_code != 0) {
@@ -138,9 +137,6 @@
 	}
 	ast_free(args.app_parse);
 	ast_free(args.app);
-=======
-	ast_ari_websocket_event_websocket(session, headers, &args);
->>>>>>> stasis-rename:rest-api-templates/res_ari_resource.c.mustache
 }
 
 /*! \brief REST handler for /api-docs/events.{format} */