]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f739178) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 9 Sep 2020 04:36:13 +0000 (06:36 +0200)
committerl10n daemon script <scripty@kde.org>
Wed, 9 Sep 2020 04:36:13 +0000 (06:36 +0200)
commitddccf4f3201d04bb9343a098bc882f1c17a85ad0
treedb2b71da8f9f92aac2798f6678198e106bf31ce5tree
parentf73917872ae1ea4e67ba019d02267a5b2d942722commit | 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/kcmdolphinservices.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history