]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 138c501) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 14 Jan 2021 06:07:18 +0000 (07:07 +0100)
committerl10n daemon script <scripty@kde.org>
Thu, 14 Jan 2021 06:07:18 +0000 (07:07 +0100)
commit9b55f5d0f9ca625c5b98096b8a9d2560c7c22a32
treeada8e8135990b73b9380f97e40002653621c421ftree
parent138c5017d918de8f7487a9e26081119e302043fdcommit | 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