Commit 2b16115e authored by Simon Morlat's avatar Simon Morlat
Browse files

fix bad merge (wasn't compiling)

parent 7f7ee739
......@@ -397,6 +397,9 @@ static void call_updating(SalOp *op){
SalMediaDescription *md;
/*accept the modification (sends a 200Ok)*/
if (md && !sal_media_description_empty(md))
......@@ -422,12 +425,7 @@ static void call_updating(SalOp *op){
linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");
/*accept the modification (sends a 200Ok)*/
<<<<<<< HEAD
>>>>>>> 949b3cd84135d234abab27a023885ad977f715c9
if (prevstate!=LinphoneCallIdle){
linphone_call_set_state (call,prevstate,"Connected (streams running)");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment