]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ed82cca) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 22 Feb 2019 04:30:16 +0000 (05:30 +0100)
committerl10n daemon script <scripty@kde.org>
Fri, 22 Feb 2019 04:30:16 +0000 (05:30 +0100)
commit33581c60c7f7df69ffcad5bda77e9b54e08ed14b
tree61ce8dc8053ff28b019d6a23a36d03619b775ee8tree
parented82cca0c0764030e3c33c603104b577b1ab4552commit | 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