l10n daemon script 684d4cd1d2 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"		2022-06-13 02:25:21 +00:00
..
chrome	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-22 01:44:19 +00:00
linux	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-06-13 02:25:21 +00:00
mac	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-22 01:44:19 +00:00
windows	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-19 01:44:15 +00:00