]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec031d0) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 9 Oct 2021 01:19:17 +0000 (01:19 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 9 Oct 2021 01:19:17 +0000 (01:19 +0000)
commit1937681d50d12a8c1a7f21c854aa99d3f4b0277b
treea9c8c03264e9e339c927575e95c020a719d13bcdtree
parentec031d0f7dfecfe0fb1cd7c17e0e60296f308c3dcommit | 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.in 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/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history