Skip to content

Scheduler Update - SVN_SILENT made messages (.desktop file) - always resolve ours

Salman Naheed requested to merge naheedsa/kstars:feature/update-scheduler into master

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"

Merge request reports