]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2baa6d1) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 31 Jul 2019 06:56:25 +0000 (08:56 +0200)
committerl10n daemon script <scripty@kde.org>
Wed, 31 Jul 2019 06:56:25 +0000 (08:56 +0200)
commit50c1fcce3777c6dbb8ba64824262da3edda98fc3
treee0de79ccc29352c84eba1aa15a9dfc1db22aeb9etree
parent2baa6d187167825c9d58367e399e04764f5a9c70commit | 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/kcmdolphingeneral.desktop diff | blob | blame | history