kdeconnect-kde/runners/findmyphone
l10n daemon script e57fd79f26 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"
2020-09-19 06:10:24 +02:00
..
plasma-runner-kdeconnect-findmyphone.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-19 06:10:24 +02:00