Merge

diff --cc coreapi/callbacks.c
index 69af42c6591c84bb61c9e0811792314eb4fe324d,550c98736c0a74c7f3d8e15f3f6131582e0763b5..c57016b97ec0b67c113417e1b3c84551ecb03f05
--- 1/coreapi/callbacks.c
--- 2/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@@ -422,7 -424,6 +424,10 @@@ static void call_updating(SalOp *op)
                }
                /*accept the modification (sends a 200Ok)*/
                sal_call_accept(op);
++<<<<<<< HEAD
 +
++=======
++>>>>>>> 949b3cd84135d234abab27a023885ad977f715c9
                if (prevstate!=LinphoneCallIdle){
                        linphone_call_set_state (call,prevstate,"Connected (streams running)");
                }