l10n daemon script e0ea9fd04c 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-12 06:06:11 +01:00
..
chrome	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-03 05:37:17 +01:00
linux	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-12 06:06:11 +01:00
mac	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-03 05:37:17 +01:00
windows	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-12 06:06:11 +01:00