]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a516f46) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 28 Oct 2019 04:14:09 +0000 (05:14 +0100)
committerl10n daemon script <scripty@kde.org>
Mon, 28 Oct 2019 04:14:09 +0000 (05:14 +0100)
commite6dc4739c3c7373f203a27cde2e31f8de1811e3a
tree9efbf8d07ef03e85bc43f5b88e934a69bdca4d2etree
parenta516f46b44b0ac5b770a2065a9da15ba97d4a3b0commit | 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.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinnavigation.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinservices.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history