GitLab

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"

... by creating a 4000x2000 px map. This should increase accuracy while
still yielding a reasonanbly small file. Plus the bogus white pixels
near Antarctica are gone in this resolution.

Let's see what the users say when this will actually be used "in the
wild" then ...

Removed the metadata from the file. This was originally based on
https://openclipart.org/detail/188901/globe-facing-europe-and-africa-by-sev-188901
which was licensed as Public Domain

This reverts commit ecc248d2.