l10n daemon script 68dfdefbda 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"		2022-10-20 02:06:33 +00:00
..
contents	Remove unused QQC1 imports	2022-08-04 19:00:20 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-10-20 02:06:33 +00:00