l10n daemon script c0ff474e72 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"		2021-08-14 01:18:38 +00:00
..
nightcolor	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-08-14 01:18:38 +00:00