l10n daemon script e80ebab9db 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"		2018-02-25 05:27:39 +01:00
..
contents/ui	Add template for Plasma QML Applet with QML extension	2017-05-19 14:23:13 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-25 05:27:39 +01:00