]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 35244be) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 10 Jul 2022 01:53:09 +0000 (01:53 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 10 Jul 2022 01:53:09 +0000 (01:53 +0000)
commit7fdd9f22d8cef4d07576336bd7c50fc0f31fd849
tree5f99bb997035adfea408453df3faea680b6a3062tree
parent35244bec7574b1e95fc0c7d51b96bf634673b391commit | 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