l10n daemon script 1ccd81ecf1 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-12-29 06:14:58 +01:00
..
chrome	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-29 06:14:58 +01:00
linux	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-29 06:14:58 +01:00
mac	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-29 06:14:58 +01:00
windows	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-29 06:14:58 +01:00