]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0c7da66) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 31 May 2015 10:13:13 +0000 (10:13 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 31 May 2015 10:13:13 +0000 (10:13 +0000)
commit586252341ea69a60b64f404dd23ef93e59c1e16c
treebfd5fff0b27bdddf74a438798e6c3f9f56590a5etree
parent0c7da668e724490b894b4d174b36d4be6002afc9commit | 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