Skip to content

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

doctor strange requested to merge drstrange/powerdevil:Plasma/6.1 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" $935.js

Merge request reports