]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 74cad37) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 5 Jan 2024 02:08:48 +0000 (02:08 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 5 Jan 2024 02:08:48 +0000 (02:08 +0000)
commite13a47f01ff96e3de87d59dc6d5da61009bba563
tree58be6e1f41c23b96bd4a95a7a2f9b892649524batree
parent74cad372427939cc7bebf0082448f02490aaf60fcommit | 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/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history