l10n daemon script 872d63c5c2 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-16 02:34:43 +00:00
..
contents/code	kwin/convergentwindows: fix signal names	2023-03-15 16:06:16 +01:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-16 02:34:43 +00:00