l10n daemon script f556dc721b 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-09-30 01:47:48 +00:00
..
contents/ui	[plasmoid] Add Photo to Plasmoid menu	2022-09-28 13:03:48 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-30 01:47:48 +00:00