l10n daemon script 872e213010 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-03-31 01:41:19 +00:00
..
contents/ui	plasmoid: Don't show redundant configure button in placeholder message	2022-01-14 16:08:39 -07:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-31 01:41:19 +00:00