mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-12 20:51:17 +00:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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"
This commit is contained in:
parent
a3521045e6
commit
cce5cf2592