]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0309bb1) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 10 Oct 2016 09:41:54 +0000 (09:41 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 10 Oct 2016 09:41:54 +0000 (09:41 +0000)
commit82cfc125f4fd37083e3adf3c5d2b999124262807
treee16607582d0551b17a0e7367e0b8167df64c6b20tree
parent0309bb18185f77c425cf7c69508f049c439eedb0commit | 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
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