]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 504db3f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 6 Jan 2019 07:35:14 +0000 (08:35 +0100)
committerl10n daemon script <scripty@kde.org>
Sun, 6 Jan 2019 07:35:14 +0000 (08:35 +0100)
commit5d9ad8d24fd495e861d5c9c88d5a5cb292365b22
tree8b97a6066eb2a3904e64656ce9c3ceb15aa52a78tree
parent504db3f702625c63cb304430e60ab21b9411cb96commit | 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
src/settings/kcm/kcmdolphingeneral.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinservices.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history