l10n daemon script 046a572542 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-07 08:58:38 +02:00
..
findmyphone	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-09 11:01:28 +02:00
remotecommands	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-07 08:58:38 +02:00