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"

all applications are single instance only

this will be used for inter-containment communication between the
panels and the homescreen

keep all windows minimized except the active one

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"

for some reason it seems interactive on the phone