l10n daemon script 3c628b921e 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"		2019-05-20 05:39:37 +02:00
..
contents	Replace plasmoids with settings app	2019-02-12 11:55:58 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-20 05:39:37 +02:00