Bug 326228 - File contains conflict markers
Summary: File contains conflict markers
Status: RESOLVED FIXED
Alias: None
Product: muon
Classification: Applications
Component: muon (show other bugs)
Version: unspecified
Platform: Kubuntu Linux
: NOR minor
Target Milestone: ---
Assignee: Jonathan Thomas
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-18 19:16 UTC by Oscar Fuentes
Modified: 2013-10-19 01:43 UTC (History)
1 user (show)

See Also:
Latest Commit: http://commits.kde.org/muon/5705d05d4fe570e64d8a2843f7f6c8d7faba8029
Version Fixed In: 3.0

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.
Description Oscar Fuentes 2013-10-18 19:16:14 UTC 
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 '=')

Reproducible: Always