l10n daemon script fcfdc340ac 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"		2019-10-16 05:24:08 +02:00
..
chrome	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-13 05:19:36 +02:00
linux	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-13 05:19:36 +02:00
mac	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-13 05:19:36 +02:00
windows	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-16 05:24:08 +02:00