l10n daemon script b015228ecd 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-03-31 02:16:10 +00:00

..

package

plasma_indicator not load background at empty areas

2019-09-09 20:28:11 +03:00

metadata.desktop

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

2021-03-31 02:16:10 +00:00