]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c1ebfc) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 20 Mar 2022 03:39:12 +0000 (03:39 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 20 Mar 2022 03:39:12 +0000 (03:39 +0000)
commit109eb3334d14a39cb5c87897042a57b9da255cfe
tree9775bead193d7bfd49bfe66328014e78f8eafa27tree
parent3c1ebfcfb19afc2a4f5f9ebe0e67689cef0253c1commit | 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
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history