]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5bc8a93) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 31 Jul 2019 03:06:34 +0000 (05:06 +0200)
committerl10n daemon script <scripty@kde.org>
Wed, 31 Jul 2019 03:06:34 +0000 (05:06 +0200)
commit89239912d842d8b295360994b2c27c305cced30e
treeb60f2de8be9fba65fe14bd4f60900d82a02e5a0ftree
parent5bc8a93bfbaa25c6f1a50158f1662ee9fa741ff7commit | 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