]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f8d1b49) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 4 Jan 2021 05:42:11 +0000 (06:42 +0100)
committerl10n daemon script <scripty@kde.org>
Mon, 4 Jan 2021 05:42:11 +0000 (06:42 +0100)
commit8c4d4b9a129b3b5dd54a7f6d67f2cf3059c7f404
tree21aeb3717e736edff1b9d835bcbfdaf08d180749tree
parentf8d1b494db19904679101139eb81a5715061aa11commit | 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