]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3123c08) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 28 Jul 2023 01:43:52 +0000 (01:43 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 28 Jul 2023 01:43:52 +0000 (01:43 +0000)
commit2f0369b333ac5c714d59b74665e76a41a5936042
tree77c8d763534e86031195fd3b20745f47118c4693tree
parent3123c086a77c28730866e848178c7e2d9a9006cbcommit | 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