l10n daemon script af5e487a45 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-10-05 06:03:37 +02:00
..
contents/ui	plasma-framework: Convert copyright statements to SPDX expressions	2020-08-13 19:08:54 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-05 06:03:37 +02:00