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