l10n daemon script 8a48eb141f 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"		2024-04-28 01:15:33 +00:00
..
contents/ui	Remove KF5 plasmoid	2023-12-23 16:34:33 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-04-28 01:15:33 +00:00