kdeconnect-kde/runners
l10n daemon script f4211e0431 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-04-22 01:12:28 +00:00
..
findmyphone SVN_SILENT made messages (.desktop file) - always resolve ours 2021-04-22 01:12:28 +00:00
remotecommands SVN_SILENT made messages (.desktop file) - always resolve ours 2021-04-22 01:12:28 +00:00