]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9b5f569) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Tue, 3 May 2022 01:50:40 +0000 (01:50 +0000)
committerl10n daemon script <scripty@kde.org>
Tue, 3 May 2022 01:50:40 +0000 (01:50 +0000)
commitd958aa57d87ba1b391bac8043949f49fb23fb43c
treea8e37ca78a43786af94e38d88d2471ec49803987tree
parent9b5f56980bc4d2f399a6b828c94b23f3626c9d21commit | 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