]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 57c0c2d) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 27 Apr 2022 01:46:00 +0000 (01:46 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 27 Apr 2022 01:46:00 +0000 (01:46 +0000)
commit8076b54a2ce8c1253385c9ee3f24938bdbf4773c
treec47ef3ac02b0930e408540a2f729989902f044aftree
parent57c0c2db7e3d76d37b4fd6efc43bb3cd987949e7commit | 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