[Bug 1241604] Re: File contains conflict markers

2014-02-12 Thread Harald Sitter
** Changed in: muon (Ubuntu) Status: In Progress => 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

[Bug 1241604] Re: File contains conflict markers

2013-11-13 Thread Rohan Garg
** Changed in: muon (Ubuntu) Status: Triaged => Fix Released ** Changed in: muon (Ubuntu) Status: Fix Released => In Progress -- 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

[Bug 1241604] Re: File contains conflict markers

2013-10-20 Thread Bug Watch Updater
** Changed in: muon Status: New => Fix Released -- 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: http

[Bug 1241604] Re: File contains conflict markers

2013-10-18 Thread Bug Watch Updater
Launchpad has imported 1 comments from the remote bug at https://bugs.kde.org/show_bug.cgi?id=326228. If you reply to an imported comment from within Launchpad, your comment will be sent to the remote bug automatically. Read more about Launchpad's inter-bugtracker facilities at https://help.launch

[Bug 1241604] Re: File contains conflict markers

2013-10-18 Thread Oscar Fuentes
I discovered the problem while trying to solve an issue with widget styles: when a KDE application started, it ignored the widget style specified on System Settings and defaulted to some ugly style. Re- setting the widget style and applying the change on System Settings made the running application

[Bug 1241604] Re: File contains conflict markers

2013-10-18 Thread Oscar Fuentes
** Bug watch added: KDE Bug Tracking System #326228 https://bugs.kde.org/show_bug.cgi?id=326228 ** Also affects: muon via https://bugs.kde.org/show_bug.cgi?id=326228 Importance: Unknown Status: Unknown -- You received this bug notification because you are a member of Ubuntu Bugs,

[Bug 1241604] Re: File contains conflict markers

2013-10-18 Thread Logan Rosen
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