l10n daemon script cc2b424aeb 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"		2018-03-13 05:19:52 +01:00
..
chrome	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-13 05:19:52 +01:00
linux	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-06 05:24:12 +01:00
mac	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-13 05:19:52 +01:00
windows	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-13 05:19:52 +01:00