]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8e80c1d) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 16 Dec 2019 04:22:38 +0000 (05:22 +0100)
committerl10n daemon script <scripty@kde.org>
Mon, 16 Dec 2019 04:22:38 +0000 (05:22 +0100)
commit837936dd9b4cba148074761c6d831ec474844f2b
tree1862cd460003e5a03f267182d20a9cbd75641e0ftree
parent8e80c1d6dc1ede9b0a44ea1bd949487280c17064commit | 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/kcmdolphinviewmodes.desktop diff | blob | blame | history