l10n daemon script 6c2b5f4971 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-01-25 02:03:41 +00:00

..

contents

plasmoid: use generateMimeData in Backend

2023-01-23 12:56:07 +08:00

metadata.json

SVN_SILENT made messages (.desktop file) - always resolve ours

2023-01-25 02:03:41 +00:00