X-Git-Url: http://git.maemo.org/git/?p=vicar;a=blobdiff_plain;f=src%2Fdata%2Faccounts%2Fvicar.service;fp=src%2Fdata%2Faccounts%2Fvicar.service;h=85bd5550411fc133d32b9206efef859c7ef52a90;hp=13a981d2e6f0a24da8369530d41a4b37a9d97a58;hb=2beca638f4ba146e25320c9c07cc1f29d0b2bba2;hpb=2b82f07726d657dff4ad091f056b8685d5ba9930

diff --git a/src/data/accounts/vicar.service b/src/data/accounts/vicar.service
index 13a981d..85bd555 100644
--- a/src/data/accounts/vicar.service
+++ b/src/data/accounts/vicar.service
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <service id="vicar">
   <type>IM</type>
+<<<<<<< HEAD
   <name>Vicar</name>
+=======
+  <name>VICaR Service Name</name>
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
   <provider>vicar</provider>
   <icon>icon-m-service-vicar</icon>