add device identifier api

[linphone] / coreapi / linphonecall.c

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 929814b52c3eace20e60fb7f4066def51f4bd6e8..786744fb2b27dcf3ee530653ab1f5ea0022a5722 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -521,7 +521,11 @@ void linphone_call_set_state(LinphoneCall *call, LinphoneCallState cstate, const
                        switch(call->reason){
                                case LinphoneReasonDeclined:
                                        call->log->status=LinphoneCallDeclined;
+<<<<<<< HEAD
                                break;
+=======
+                                       break;
+>>>>>>> add device identifier api
                                case LinphoneReasonNotAnswered:
                                        call->log->status=LinphoneCallMissed;
                                break;