]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d4476fa) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 9 Jul 2022 01:52:00 +0000 (01:52 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 9 Jul 2022 01:52:00 +0000 (01:52 +0000)
commitb1eb12e03ac0206c463c95b207209f5e181f3d71
tree9a9946040e03799b61176dc0a8b744a42cc3b051tree
parentd4476fab9fe4fc3c252d18b5244572310f57cc38commit | 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/dolphinpart.json.in diff | blob | blame | history
src/org.kde.dolphin.desktop diff | blob | blame | history
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