Looks like the conflict was introduced in this upstream commit: https://projects.kde.org/projects/extragear/sysadmin/muon/repository/revisions/586f2fb36b1a115c82fbffd2d223c11314379e12
Does the software still launch when you run this command, even though it complains? I'm going to mark this as low importance in that case, as it doesn't really hinder the functionality of the software. Also, would you mind forwarding this bug to KDE so that it can be fixed upstream? You can do this at https://bugs.kde.org/. Once you have done that, please add it as a bug watch, as described here: https://wiki.ubuntu.com/Bugs/Watches ** Changed in: muon (Ubuntu) Status: New => Triaged ** Changed in: muon (Ubuntu) Importance: Undecided => Low -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to 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 -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
