l10n daemon script babb8587f8 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"		2025-06-13 01:33:11 +00:00
..
contents/ui	components/mobileshell: Introduce singleton for plasma-nm lib	2025-04-25 14:58:18 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2025-06-13 01:33:11 +00:00