]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5a3c57f) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 1 May 2022 01:55:50 +0000 (01:55 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 1 May 2022 01:55:50 +0000 (01:55 +0000)
commitce720337e5f7db8fa52b5f092b4cb5c4154abac0
tree46a4c6710963739af79fe29df0a9e23ba85eedddtree
parent5a3c57ffb24f7fcc6975e4a99dc07a007304ada6commit | 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