]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 89158c6) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 6 Jan 2019 04:25:48 +0000 (05:25 +0100)
committerl10n daemon script <scripty@kde.org>
Sun, 6 Jan 2019 04:25:48 +0000 (05:25 +0100)
commit1873e2f08fed0397542c04ca02f67efc2fa307d3
treec9727b289b3c7ee4240f99fe5a3abed04f7ef17btree
parent89158c6b3d29b9c01fe9dcc4c2b477dbc80abbdbcommit | 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