projects
/
vicar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://drop.maemo.org/git/vicar
[vicar]
/
src
/
data
/
accounts
/
vicar.service
diff --git
a/src/data/accounts/vicar.service
b/src/data/accounts/vicar.service
index
47db52c
..
85bd555
100644
(file)
--- 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>
<?xml version="1.0" encoding="UTF-8" ?>
<service id="vicar">
<type>IM</type>
+<<<<<<< HEAD
+ <name>Vicar</name>
+=======
<name>VICaR Service Name</name>
<name>VICaR Service Name</name>
+>>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
<provider>vicar</provider>
<icon>icon-m-service-vicar</icon>
<provider>vicar</provider>
<icon>icon-m-service-vicar</icon>