[Bug 1241604] [NEW] File contains conflict markers

[Oscar Fuentes]

Public bug reported:

This is Kubuntu 13.10 AMD64.

The file  /usr/share/kde4/services/muon-knsplasmoids-backend.desktop
contains conflict markers. At line 110:

<<<<<<< HEAD
=======
>>>>>>> 2.0
X-KDE-Library=muon-knsbackend


Due to some other (possibly unrelated) problem I was forced to run

kbuildsycoca4 --noincremental

which complained

"KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 110: " Invalid entry (missing '=') 
"KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 111: " Invalid entry (empty key) 
"KConfigIni: In file /usr/share/kde4/services/muon-knsplasmoids-backend.desktop, line 112: " Invalid entry (missing '=')

** Affects: muon (Ubuntu)
     Importance: Undecided
         Status: New

-- 
You received this bug notification because you are a member of Kubuntu
Bugs, which is subscribed to muon in Ubuntu.
https://bugs.launchpad.net/bugs/1241604

Title:
  File contains conflict markers

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/muon/+bug/1241604/+subscriptions