]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 214b017) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 14 Sep 2020 07:58:23 +0000 (09:58 +0200)
committerl10n daemon script <scripty@kde.org>
Mon, 14 Sep 2020 07:58:23 +0000 (09:58 +0200)
commit65c2d95a7dca988f0ead00e105b8aad0c57732f7
tree9955740ef44c454ae65be0a0443a71ea49452c20tree
parent214b0172661d9907ac2959f6331b3331f0b827f9commit | 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/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