]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 902e8ee) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 4 Jul 2021 01:17:03 +0000 (01:17 +0000)
committerl10n daemon script <scripty@kde.org>
Sun, 4 Jul 2021 01:17:03 +0000 (01:17 +0000)
commit7f562433c03534933d118b3b4abd6ab85bb4cabb
treeb687cb5795b7ae527a6bff78e4aa653a8462c41etree
parent902e8ee07e2dd67a407af3f727a03b6486d2adf8commit | 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