]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 675699d) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 15 Jul 2020 03:52:19 +0000 (05:52 +0200)
committerl10n daemon script <scripty@kde.org>
Wed, 15 Jul 2020 03:52:19 +0000 (05:52 +0200)
commit1995668f8e279209c092287d6b5da5f4bcb4dd9e
tree8aff0777203acb5414e70aaeab36d892d7e9feb9tree
parent675699dfc088a86b541624d1dbb825ce674256e1commit | 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