Git commit 5705d05d4fe570e64d8a2843f7f6c8d7faba8029 by Harald Sitter. Committed on 19/10/2013 at 00:36. Pushed by sitter into branch 'master'.
drop conflict markers introduced by recent merge CCMAIL: [email protected] M +1 -3 libmuon/backends/KNSBackend/muon-knsplasmoids- backend.desktop http://commits.kde.org/muon/5705d05d4fe570e64d8a2843f7f6c8d7faba8029 diff --git a/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop b/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop index 343b391..9a203d4 100644 --- a/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop +++ b/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop @@ -116,9 +116,7 @@ Comment[uk]=Встановіть плазмоїди і зробіть ваш р Comment[x-test]=xxInstall plasmoids and raise the power of your workspace!xx Comment[zh_CN]=安装 plasmoids，让您的工作区更强大！ Comment[zh_TW]=安裝小元件，提升您的工作空間的能量！ -<<<<<<< HEAD -======= ->>>>>>> 2.0 + X-KDE-Library=muon-knsbackend X-KDE-PluginInfo-Name=muon-knsbackend-plasmoids X-KDE-PluginInfo-License=GPL -- 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/muon/+bug/1241604/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
