]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 32db592) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 3 Apr 2016 09:50:58 +0000 (09:50 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 3 Apr 2016 09:50:58 +0000 (09:50 +0000)
commit0c904334781084533e699b95f9c2dde3a9833fcf
treeaaf9e85b1d5e80f8d396e50886edcc665ccefab5tree
parent32db592309eeb3473d1e7b31fe2ffe0fd2be7947commit | 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