l10n daemon script c4495d5855 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-02-04 02:05:14 +00:00
..
contents/ui	Fix "Pair a Device..." button in plasmoid	2023-01-18 10:29:25 -05:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-02-04 02:05:14 +00:00