l10n daemon script 1e574d18e3 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"		2016-08-19 09:28:59 +00:00
..
contents/ui	Move the PluginChecker to the kdeconnect qml plugin	2016-06-12 22:24:35 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-19 09:28:59 +00:00