l10n daemon script af8ed75b29 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"		2020-06-18 05:32:17 +02:00
..
contents/ui	templates: Convert license statements to SPDX headers	2020-02-29 13:25:01 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:32:17 +02:00