]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a38f1c8) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 9 Aug 2021 01:11:30 +0000 (01:11 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 9 Aug 2021 01:11:30 +0000 (01:11 +0000)
commitcb9142a9bbabe0d4adc65253ede01bc998cf0edb
tree92a9a4fed741625bef08ac80da953d2c6c29e527tree
parenta38f1c8eaedd30eabe3d55feb251119d74244852commit | 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/dolphinpart.desktop.in diff | blob | blame | history
src/org.kde.dolphin.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphingeneral.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history