From 27f978c532865b9a32cdb688a1cf29d0f0bf1603 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 26 May 2011 19:34:17 +0200
Subject: [PATCH] fix merge issue

---
 Classes/LinphoneUI/LinphoneManager.m | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m
index 8b4a7b156..c02416116 100644
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@@ -25,14 +25,11 @@
 #include <netdb.h>
 #import <AVFoundation/AVAudioSession.h>
 #import <AudioToolbox/AudioToolbox.h>
-<<<<<<< HEAD
 #include "tunnel/TunnelManager.hh"
-
-using namespace belledonnecomm;
-=======
 #import <AddressBook/AddressBook.h>
 
->>>>>>> master
+
+using namespace belledonnecomm;
 
 static LinphoneCore* theLinphoneCore=nil;
 static LinphoneManager* theLinphoneManager=nil;
@@ -73,7 +70,7 @@ extern void libmsamr_init();
         ABMutableMultiValueRef lPhoneNumbers = ABRecordCopyValue((ABRecordRef)lContact, kABPersonPhoneProperty);
         for ( int i=0; i<ABMultiValueGetCount(lPhoneNumbers); i++) {
             CFStringRef lLabel = ABMultiValueCopyLabelAtIndex(lPhoneNumbers,i);
-            CFStringRef lValue = ABMultiValueCopyValueAtIndex(lPhoneNumbers,i);
+            CFStringRef lValue = (CFStringRef)ABMultiValueCopyValueAtIndex(lPhoneNumbers,i);
             CFStringRef lLocalizedLabel = ABAddressBookCopyLocalizedLabel(lLabel);    
             NSString* lNormalizedNumber =  [(NSString*)lValue stringByReplacingOccurrencesOfString:@" " withString:@""];
             lNormalizedNumber = [lNormalizedNumber stringByReplacingOccurrencesOfString:@"(" withString:@""];