GitLab

... as the file is only loaded once and thus, it's geometry doesn't
change later anymore anymore.

... as the Marble guys now apparently finally fixed their versioning ;-)

BUG: 452534

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"

Signed-off-by: Snehit Sah <snehitsah@protonmail.com>

This reverts commit 14404b1c.