]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 579eade) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 22 Jan 2023 02:03:57 +0000 (02:03 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 22 Jan 2023 02:03:57 +0000 (02:03 +0000)
commit83964c2071893b65e6fd8dc96bad5388107c8ef3
tree77e6ceb4958d7729d7ba2b854565063ce05a426atree
parent579eadeb6ddffb03e8043090a330c6dba0717299commit | 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