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"

Glen Ditchfield authored Dec 19, 2020 and Glen Ditchfield committed Jan 02, 2021

If the Item Viewer is visible in the sidebar and the Agenda or Month
view shows more than one occurrence of an incidence, and the user
selects several of them in turn, the Item Viewer does not update after
the first one, because CalendarView does not check whether the
selected date has changed.

Glen Ditchfield authored Dec 17, 2020 and Laurent Montel committed Dec 18, 2020

`this` is passed as a parent pointer when the EventViewer is created,
so it is deleted automatically.

Prior to this patch Korganizer showed tooltips for the wrong
collections. Simplified this code to generate the tooltip string on
demand as well, this also fixes the issue.

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"

(cherry picked from commit 28903cc7)

Daemon is a technical term that the user doesn't care about.