]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ed3bb94) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 21 Nov 2015 18:58:19 +0000 (18:58 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 21 Nov 2015 18:58:19 +0000 (18:58 +0000)
commit0587f994dc408e9ea98b0007f44179e2e4b6d4d0
tree7244eb4dc4549707a5017fff6378b5b571f948a2tree
parented3bb94ea095e3ba3e3b96584d817899121e1653commit | 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/kcmdolphinservices.desktop diff | blob | blame | history