[Bug 1241604] Re: File contains conflict markers

[Bug Watch Updater]

** Changed in: muon
       Status: New => Fix Released

-- 
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/muon/+bug/1241604/+subscriptions