]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d63d53e) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Fri, 16 Jun 2023 01:40:55 +0000 (01:40 +0000)
committerl10n daemon script <scripty@kde.org>
Fri, 16 Jun 2023 01:40:55 +0000 (01:40 +0000)
commit51fcd600a8adb235bd510724fb3b8f8df9e0c6b6
treec7aef154da569eb271f50d11388f4ad858782525tree
parentd63d53eff15f7ad14e0dc7032fbfc1f0821a9cdacommit | 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/dolphinpartactions.desktop diff | blob | blame | history