]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c7531ba) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 29 Mar 2022 03:51:20 +0000 (03:51 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 29 Mar 2022 03:51:20 +0000 (03:51 +0000)
commita8966d230c7bdbca269ddc5b6ec1c71d9c8b2e20
tree7da40379f702081771386f40cce686d650c88cd3tree
parentc7531ba749ebe9d3f908057067156daf22a20b7acommit | 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/dolphinpart.desktop.in diff | blob | blame | history
src/org.kde.dolphin.desktop diff | blob | blame | history
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