]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c1a5c50) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 19 Nov 2022 01:51:46 +0000 (01:51 +0000)
committerl10n daemon script <scripty@kde.org>
Sat, 19 Nov 2022 01:51:46 +0000 (01:51 +0000)
commitb72f800ac4b299af5546f70deb4b7664f5890d89
treeefe127b08d1b3b418e550aabf38d5e616eb383f1tree
parentc1a5c5076d9f0011e59a781acd70849672b07a47commit | 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/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