l10n daemon script aeddd5ab75 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"		2022-08-01 01:44:56 +00:00
..
contents/ui	PipeWireThumbnail, Record: Wayland handling doesn't belong in KPipeWire	2022-06-23 11:25:08 +02:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-08-01 01:44:56 +00:00