kdeconnect-kde/runners
l10n daemon script 91982e3099 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-02-14 09:56:08 +01:00
..
findmyphone SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-14 09:56:08 +01:00
remotecommands SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-14 09:56:08 +01:00