mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-17 23:11:48 +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
854d997fd5
commit
da42e4b166