]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ceaa0b) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 16 May 2022 01:50:33 +0000 (01:50 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 16 May 2022 01:50:33 +0000 (01:50 +0000)
commit0b27270beec7a9b8309322b0c869e71dde30f3d2
tree00ec195e1694f13f14867e6b50f7b88400ebbe84tree
parent2ceaa0ba1be1317b52a5a5d4439585b9af3bab2dcommit | 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.json.in diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history