l10n daemon script 7cc0249ecd 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"		2023-12-10 01:17:24 +00:00
..
contents/ui	plasmoid: Add port to KF6/Plasma 6 alongside the current KF5/Plasma 5 version	2023-11-30 23:41:36 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-10 01:17:24 +00:00