l10n daemon script 518b94e018 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-06-28 01:25:09 +00:00
..
contents/ui	kwin/convergentwindows: Don't maximize xwaylandvideobridge ghost window	2024-03-08 15:11:49 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-06-28 01:25:09 +00:00