l10n daemon script 2a58d49a5d 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-11-04 02:17:34 +00:00
..
findmyphone	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-11-04 02:17:34 +00:00
remotecommands	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-11-04 02:17:34 +00:00