l10n daemon script cd15b7008c 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-06-06 07:29:50 +02:00
..
chrome	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-06 07:29:50 +02:00
linux	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-06 07:29:50 +02:00
mac	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-06 07:29:50 +02:00
windows	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-06 07:29:50 +02:00