]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7479fef) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 1 Sep 2020 04:25:15 +0000 (06:25 +0200)
committerl10n daemon script <scripty@kde.org>
Tue, 1 Sep 2020 04:25:15 +0000 (06:25 +0200)
commitf15f74e241ec4bd1f271e2dd7245509c565e6c02
treee17bfed0ffd140a87ec44de4c6aebfe96ce49c3ftree
parent7479fef79962cede2c5d5ad7383c11a83c4f978dcommit | 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/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