l10n daemon script 10de7b3763 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-07-23 09:50:37 +02:00
..
contents/ui	Fix file dialog usage in app and plasmoid	2020-07-18 23:59:07 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 09:50:37 +02:00