]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cede4fe) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 23 Apr 2021 01:19:55 +0000 (01:19 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 23 Apr 2021 01:19:55 +0000 (01:19 +0000)
commit020ba2c3fc94336545f6b8d7c13c9a615000482a
tree162a2222c6664375ed2f18b5ed3471e49e03f70dtree
parentcede4fed799a17c2ecd6186ef8f731c61b4a4139commit | 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