]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 084dbbe) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 20 Sep 2021 01:28:18 +0000 (01:28 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 20 Sep 2021 01:28:18 +0000 (01:28 +0000)
commitf8c292c556b87a19e9099cc98bf0ab88424472b2
treec0f088c45041b562e517b9c9c173430626d894e3tree
parent084dbbe2f7b62a50a9c2d44fb5f6ae0aebac97ebcommit | 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