l10n daemon script 3922cd51ab 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-07-29 01:15:23 +00:00
..
nightcolor	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-29 01:15:23 +00:00