]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 36dc660) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 27 Sep 2024 01:25:00 +0000 (01:25 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 27 Sep 2024 01:25:00 +0000 (01:25 +0000)
commit5242d0ce3866b96a100e620b6f52277cd48e8730
tree262be6dee3ad1460b83f72f8af1d06b44e0efbb0tree
parent36dc660a4699df0179b8fa5cb7473e95df0545d1commit | 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.json.in diff | blob | blame | history