]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b95cc59) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sat, 3 Mar 2018 04:23:49 +0000 (05:23 +0100)
committerl10n daemon script <scripty@kde.org>
Sat, 3 Mar 2018 04:23:49 +0000 (05:23 +0100)
commite46421bfeee7a2d4f8f61c24feee2758325e86a4
tree3005a0e4df2ad3ae3010b2a400e0bbe31b25e23atree
parentb95cc59091f9b538f87b616b92e91d6aace0e1becommit | 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/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/kcmdolphinservices.desktop diff | blob | blame | history
src/settings/kcm/kcmdolphinviewmodes.desktop diff | blob | blame | history
src/views/versioncontrol/fileviewversioncontrolplugin.desktop diff | blob | blame | history