]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d658c7e) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 29 Mar 2022 02:21:23 +0000 (02:21 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 29 Mar 2022 02:21:23 +0000 (02:21 +0000)
commit447c35868c6268789e8f2ae0abecd28df02029d8
tree044ad27ca6bee897246b15b827ac1be605ea2091tree
parentd658c7e09024db81266d210fa8932cb5ab2d6190commit | 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.desktop.in diff | blob | blame | history
src/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history