]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7a28858) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 2 Mar 2020 04:36:51 +0000 (05:36 +0100)
committerl10n daemon script <scripty@kde.org>
Mon, 2 Mar 2020 04:36:51 +0000 (05:36 +0100)
commitb10a84c770d17e06bf3e2999e935ff4dd3a203af
tree904a1fdf90b11220f19695c3e97ea1dded54f41ctree
parent7a2885853a424042cb631f83a1db278560679d9ecommit | 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