]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6b46ebe) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 5 May 2022 01:47:17 +0000 (01:47 +0000)
committerl10n daemon script <scripty@kde.org>
Thu, 5 May 2022 01:47:17 +0000 (01:47 +0000)
commitab9fcf0041d5ea220e07b4abe4d53bb10c385be2
treec92c246f17c7cdaa5a00121f2d865b4ea43348b2tree
parent6b46ebe64882651c535ee97f17c5b8d96bb26009commit | 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