kdeconnect-kde/runners
l10n daemon script e873eddcde 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-06-17 14:06:59 +02:00
..
findmyphone SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-17 14:06:59 +02:00
remotecommands SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-17 14:06:59 +02:00