l10n daemon script cd1d047a3c 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"		2021-02-15 07:07:57 +01:00
..
plasma-runner-kdeconnect-findmyphone.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-02-15 07:07:57 +01:00