]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d624af1) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 1 Sep 2020 08:13:23 +0000 (10:13 +0200)
committerl10n daemon script <scripty@kde.org>
Tue, 1 Sep 2020 08:13:23 +0000 (10:13 +0200)
commit4b438da3cb4699d395565a0d5e71d7f7d77c945d
treebf4b0a515ceb84fd7c365fe2a49dc49363dddb0dtree
parentd624af1091f78ea234050058b9df1e5c9e1d0592commit | 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/org.kde.dolphin.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