]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 227ccfd) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 3 Aug 2022 01:49:02 +0000 (01:49 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 3 Aug 2022 01:49:02 +0000 (01:49 +0000)
commit86c103e765231f1d4daa0507698548af035d0048
tree96518c7b37956a3fc5ac3c5d4b9020556c1cb023tree
parent227ccfdd3d745906d9a29144e4423f62073dd0cfcommit | 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