merging 5.2 into master gets me several merge conflicts in desktop services, which I cannot reasonably resolve, mostly because:
++<<<<<<< HEAD +Comment[zh_TW]=桌面效果使用的組合器設定 ++======= + Comment[zh_TW]=桌面效果使用的組合器組態 ++>>>>>>> Plasma/5.2 I cannot read that (nor other translations) => which branch to I pick? Cheers, Thomas
Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
