l10n daemon script 057a114629 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2017-09-19 04:58:52 +02:00
..
contents/ui	Only show notification title in plasmoid if different to app name	2017-08-22 18:18:34 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-19 04:58:52 +02:00