l10n daemon script 28e6d523fb 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-03-08 01:13:51 +00:00
..
contents/ui	kwin/convergentwindows: Don't set maximize property for fullscreen windows	2024-03-04 14:30:37 -05:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-03-08 01:13:51 +00:00