]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 37d415c) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 23 Aug 2021 01:28:23 +0000 (01:28 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 23 Aug 2021 01:28:23 +0000 (01:28 +0000)
commite76bf5cb18ca46a0adc84ead3801726814cf6fd3
tree53737c03bc7f77280530c85095972d04ca7063e4tree
parent37d415cedceaad5bf8b009d9c91b8a89bd1f139bcommit | 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.in 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/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history