]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 42fd196) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Wed, 28 Dec 2022 02:03:50 +0000 (02:03 +0000)
committerl10n daemon script <scripty@kde.org>
Wed, 28 Dec 2022 02:03:50 +0000 (02:03 +0000)
commitdf11f2f168911c3d350216ddb013daac94b9fde4
tree9b6abeb6916b2e8075c076b25889882a60da68ectree
parent42fd1964bdedf8efc41023568f971444bcb0283dcommit | 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.json.in diff | blob | blame | history
src/dolphinpartactions.desktop diff | blob | blame | history
src/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.json diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.json diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.json diff | blob | blame | history