]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6c5cd76) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 20 Dec 2017 07:25:12 +0000 (08:25 +0100)
committerl10n daemon script <scripty@kde.org>
Wed, 20 Dec 2017 07:25:12 +0000 (08:25 +0100)
commit91eb6aa37ae38c73441b6100a4ea9beb35e982f4
treedd24365c592988148069d46448f42f1055229c19tree
parent6c5cd76d6f1f54974026a200217c30a84c5acd91commit | 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