]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 989d19c) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 7 Apr 2022 01:45:45 +0000 (01:45 +0000)
committerl10n daemon script <scripty@kde.org>
Thu, 7 Apr 2022 01:45:45 +0000 (01:45 +0000)
commit9a334caf7d46f5d87079545bd2e67df13a56ed56
tree4c00eb176c69edf73cd4c5744d619c2e3666ebc7tree
parent989d19c126abc35f5c6df2a1117334f1468e48e8commit | 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