]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ecc5279) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 13 Jul 2022 01:48:42 +0000 (01:48 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 13 Jul 2022 01:48:42 +0000 (01:48 +0000)
commit8a721c35fcd6393cbda17290ab7dd6891487de44
treecdf5120ea644a630cb04c7e62a37fb8342c1203ftree
parentecc5279f8dce498c9b5745be6953f48af664c5cbcommit | 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