l10n daemon script 950b8c279a 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-09 02:09:25 +00:00
..
contents/ui	Add missing )	2021-03-13 18:58:26 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-08-09 02:09:25 +00:00