]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 74ecb5b) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 2 Mar 2023 02:25:05 +0000 (02:25 +0000)
committerl10n daemon script <scripty@kde.org>
Thu, 2 Mar 2023 02:25:05 +0000 (02:25 +0000)
commit6adbb73b992c6196e4c46023aafcf245574702e7
tree95c73c2e3ef64d6870d2ad84f8d8f68ebb747477tree
parent74ecb5b9b473ad9a39c32eca8f7d2707345ab1c3commit | 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