]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7153234) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 26 Apr 2022 01:43:17 +0000 (01:43 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 26 Apr 2022 01:43:17 +0000 (01:43 +0000)
commitc88ce580e6ad720342e7efec2c7e24d8362b648c
treea57c2bbbc42f5009fb511860e037b0ae85a90e17tree
parent7153234e462fcb100093dedb490f55a8088cf4d7commit | 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