l10n daemon script c314093d7e 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-03-24 05:53:37 +01:00
..
plasma-runner-kdeconnect-remotecommands.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-03-24 05:53:37 +01:00