]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d0c3e37) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 23 Jul 2022 01:50:13 +0000 (01:50 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 23 Jul 2022 01:50:13 +0000 (01:50 +0000)
commitf0749ee42ccb2e0a7caee165b9934de8e61bfcbc
tree504e56807cab4bca7b4c87aa2973bbd586ce2153tree
parentd0c3e373a131f9e9d1dc183c4d8c8b24fa89346ccommit | 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