]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 29acb19) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 6 Jun 2022 01:43:37 +0000 (01:43 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 6 Jun 2022 01:43:37 +0000 (01:43 +0000)
commit579b38050d0ac86a23465bbaba796e1c9bb25619
tree81b9b3f67e1c8fdba37fc5b17bb8e42c9715006btree
parent29acb196ab7f7add77c6656dc911786d6f786127commit | 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/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