]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9bcac45) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 20 Jul 2022 01:45:24 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 20 Jul 2022 01:45:24 +0000 (01:45 +0000)
commitd0c3e373a131f9e9d1dc183c4d8c8b24fa89346c
tree77760191fe9e104cc68686aef132274fbb040e46tree
parent9bcac452caa1941ec667b47b00f8c8da019eb5e1commit | 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.json diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history