]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aac88e2) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 10 Oct 2016 12:24:39 +0000 (12:24 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 10 Oct 2016 12:24:39 +0000 (12:24 +0000)
commit8828e686e94056af17e0c13b7550451c881af060
tree64c9d66bcfb52483e860aba09ad64c580566e1a6tree
parentaac88e2b0ffcd8ccd9bd84326002b6786098dfd1commit | 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