]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 990c6e7) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 20 Mar 2022 02:14:36 +0000 (02:14 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 20 Mar 2022 02:14:36 +0000 (02:14 +0000)
commitfa72ae8577d7bae31cd92c8d393893a1ec214f80
treed2b66c824598bceef4e982d25af605422a89bff3tree
parent990c6e7aa5b8035817c6e4c5a0bded10455f1f87commit | 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