]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6bc4f18) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 19 Feb 2016 09:23:18 +0000 (09:23 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 19 Feb 2016 09:23:18 +0000 (09:23 +0000)
commit20cb1492e7815cf46e231839fe0fd982ce19ceff
treea122c08dd6f63ffc85616760bea979bbd04bccc5tree
parent6bc4f18f60f9acceb2b4a0338da35b1a04340a3fcommit | 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