]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2100a7a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 28 Jan 2019 04:21:42 +0000 (05:21 +0100)
committerl10n daemon script <scripty@kde.org>
Mon, 28 Jan 2019 04:21:42 +0000 (05:21 +0100)
commit52c019c9cbf679af5c24438bbe840ef890ae3f92
treeadfc067569f7eece8812a24a36c1b2a1a74d6353tree
parent2100a7a5c85931d46b72d391faa3d136d4401010commit | 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 diff | blob | blame | history