GitLab

(cherry picked from commit aab8a63c)

addResource(), which is potentially calculation intensive, was
called twice every time a resource was newly enabled.

Friedrich W. H. Kossebau authored Oct 01, 2021 and Laurent Montel committed Oct 01, 2021

GIT_SILENT

The clazy config in .gitlab-ci.yml doesn't specify function-args-by-value
(deliberately).

BUG:441660

(cherry picked from commit 442027dd)

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"

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"

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"

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"

This reverts commit 3d51cc78.