]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: be95cd3) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 25 Apr 2022 01:52:30 +0000 (01:52 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 25 Apr 2022 01:52:30 +0000 (01:52 +0000)
commit7153234e462fcb100093dedb490f55a8088cf4d7
tree3f4956e7f55b2d4efd719739a7cdaf9cc2f7bf8etree
parentbe95cd3025b113e1a2b34b2b1a42ffe544b39c4ecommit | 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.json diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history