]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 65c2d95) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 20 Sep 2020 07:20:49 +0000 (09:20 +0200)
committerl10n daemon script <scripty@kde.org>
Sun, 20 Sep 2020 07:20:49 +0000 (09:20 +0200)
commita32cb1c915960320812e7d1d63fe68ffb729ba37
tree338bc70e017ddb0d17e13525b9ab066bc4635fcftree
parent65c2d95a7dca988f0ead00e105b8aad0c57732f7commit | diff
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"
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history