]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 776d746) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 30 Apr 2022 01:42:27 +0000 (01:42 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 30 Apr 2022 01:42:27 +0000 (01:42 +0000)
commit1a8be1544d791e098256cfa5e2ab045e44d42320
treedf033505a9ca98413b82b61241c48de7822760c8tree
parent776d746c6795b19dd5e21390654a69bce3c4dc3fcommit | 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