l10n daemon script a12a29e19d 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"

2021-01-24 06:48:01 +01:00

..

contents/qml

plasma-framework: Convert copyright statements to SPDX expressions

2020-08-13 19:08:54 +00:00

metadata.desktop

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

2021-01-24 06:48:01 +01:00