]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 68a924a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 13 Mar 2018 04:14:09 +0000 (05:14 +0100)
committerl10n daemon script <scripty@kde.org>
Tue, 13 Mar 2018 04:14:09 +0000 (05:14 +0100)
commit6ab76d791caa552091057f88365b24847014ff1d
tree9f9e0cd8d12e0446a1a895136efba2806b806614tree
parent68a924af05e7adf1c36b8139ee33a739298fe36dcommit | 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
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history