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