]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: adb7c47) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 15 Jan 2016 09:54:42 +0000 (09:54 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 15 Jan 2016 09:54:42 +0000 (09:54 +0000)
commitb336066e1d3b605853fa3502d31951ff47cc33f0
tree6101c2efd2efa59941bb8564b61b3b4d9d98e103tree
parentadb7c47885a805c1e8587d24d4767fde22ea15b5commit | 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/org.kde.dolphin.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
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history