]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ab9fcf0) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 6 May 2022 01:46:29 +0000 (01:46 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 6 May 2022 01:46:29 +0000 (01:46 +0000)
commit553cb880c249c34794d694836cc53a7f4bb31858
tree414fd533692f8e7db7506cce91825239433a3162tree
parentab9fcf0041d5ea220e07b4abe4d53bb10c385be2commit | 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