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

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