l10n daemon script dbe069edfa 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-17 02:07:26 +00:00
..
contents/ui	Revert "Port away from PlasmaCore and PlasmaExtras to Kirigami"	2023-11-08 21:16:19 +03:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-17 02:07:26 +00:00