]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9c432e6) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 8 Dec 2015 10:05:01 +0000 (10:05 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 8 Dec 2015 10:05:01 +0000 (10:05 +0000)
commitc0d5537afb10f09aaa6b47a994e8f8024c1006b4
tree8487c351a74f6c737759ba63b609f1ad30aff821tree
parent9c432e6905c41193e0dff759ba5c61ac295e41accommit | 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 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/kcmdolphinservices.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history