X-Git-Url: http://git.maemo.org/git/?p=vicar;a=blobdiff_plain;f=src%2Fvicar-lib%2Fcpp%2Ftelepathyutility.cpp;h=4bb6e31689222c240bb744d0104ba3e4e0752839;hp=216e21356edaa83c79e88fd77f07d7fa511085ec;hb=a39e35febe1d76a81b5c4ac452ac64309d1bc622;hpb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2

diff --git a/src/vicar-lib/cpp/telepathyutility.cpp b/src/vicar-lib/cpp/telepathyutility.cpp
index 216e213..4bb6e31 100644
--- a/src/vicar-lib/cpp/telepathyutility.cpp
+++ b/src/vicar-lib/cpp/telepathyutility.cpp
@@ -151,11 +151,7 @@ bool TelepathyUtility::createAccount(){
     accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.Enabled",true);
     accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.ConnectAutomatically",true);
     accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.RequestedPresence",QVariant::fromValue(presence));
-<<<<<<< HEAD
     //accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.Service","vicar"); //Required when service can't be determined by the protocol name
-=======
-    accountPropertiesMap.insert("org.freedesktop.Telepathy.Account.Service","vicar"); //Required when service can't be determined by the protocol name
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
     accountPropertiesMap.insert("com.nokia.Account.Interface.Compat.Profile","vicar");
 
     QStringList valuesList;