]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c6ecfa) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 5 Jun 2018 03:34:15 +0000 (05:34 +0200)
committerl10n daemon script <scripty@kde.org>
Tue, 5 Jun 2018 03:34:15 +0000 (05:34 +0200)
commita8bd6f4b1f65d402aacc2d66097fc0cbde870028
treea3de7379606d7896e98f2b3047a24c095f2198cetree
parent3c6ecfa246c17077f2e84a45e56da8943d6db1c3commit | 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
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history