]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 88c504b) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 30 Dec 2022 02:12:34 +0000 (02:12 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 30 Dec 2022 02:12:34 +0000 (02:12 +0000)
commit36fda229fef526ae306c6efbaa5b26ec5e8dcfce
tree27305498dbe311b49514376d4d867d44cf8549eetree
parent88c504b38119fe76230630b276d078d636855153commit | 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