]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f08a8dd) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 29 Apr 2022 01:44:43 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 29 Apr 2022 01:44:43 +0000 (01:44 +0000)
commit776d746c6795b19dd5e21390654a69bce3c4dc3f
tree46f16c92e9e3ad506c0ab9d8346acc0e0095a5eetree
parentf08a8dd06b5658a4b62fa3a1550ef39fec722a7ecommit | 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