]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8f051a3) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 28 Jan 2019 07:29:51 +0000 (08:29 +0100)
committerl10n daemon script <scripty@kde.org>
Mon, 28 Jan 2019 07:29:51 +0000 (08:29 +0100)
commitdf3c2c1391a59a4d7d55365c6259f786e81ae642
tree9ac6c5d7f8bca9122210f6566f750d0dba41958atree
parent8f051a391db543a05c00bc1323634a48d7e6444dcommit | 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