From: l10n daemon script <scripty@kde.org>
Date: Thu, 12 Jun 2025 01:33:48 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/d4e8b06b0ff824e3e3bb3a397b9379eee1bea929?hp=d4e8b06b0ff824e3e3bb3a397b9379eee1bea929

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"
---