]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d48b733) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 10 Jun 2016 09:41:49 +0000 (09:41 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 10 Jun 2016 09:41:49 +0000 (09:41 +0000)
commit0cbc3d195b55644a31db4533613afc1a58b43704
tree59fcb8e1dd124b8aa11e9967c4f78a1625d228f5tree
parentd48b73349241a46ad70cac5a5ce3e11f641650afcommit | 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/kcmdolphinservices.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history