]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9bb2b0a) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 2 Jun 2022 01:44:29 +0000 (01:44 +0000)
committerl10n daemon script <scripty@kde.org>
Thu, 2 Jun 2022 01:44:29 +0000 (01:44 +0000)
commit165448bc7f5dc943c259b37d9e3438335ca0251e
tree203db107cd972fe548890c5ad9bef794b83d1519tree
parent9bb2b0a6a80298d33f6c568bef051d98e8fff3d9commit | 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