l10n daemon script c9d1ec9c6a 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-03-13 02:49:01 +00:00
..
contents/code	kwin/scripts: Add convergentwindows and switch from kwin maximized mode	2023-03-06 05:57:45 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-13 02:49:01 +00:00