]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 06bd5b2) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 18 Apr 2022 02:45:08 +0000 (02:45 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 18 Apr 2022 02:45:08 +0000 (02:45 +0000)
commit4012ea30c9061a5259c96de64aca114cec5014aa
tree3dc0471472dd81047c1520049aa3de2709f6210ctree
parent06bd5b2ee9324e268da2e5c0cf54bc8d8d725ae9commit | 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.desktop diff | blob | blame | history