]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e34eba7) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 18 May 2022 01:44:40 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 18 May 2022 01:44:40 +0000 (01:44 +0000)
commitb700c94d3eab387cfdef5aea5460fde5d2efa5bd
treeef592033f8d3662ebe6379a762e7308ea2d28f4etree
parente34eba7e0fe1720830fd410e4df42205d28f355acommit | 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