SVN_SILENT made messages (.desktop file) - always resolve ours
420ab77b4e1d
Actions

Authored by l10n daemon script <scripty@kde.org> on Mar 21 2019, 4:56 AM.

Description

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"

Committed

l10n daemon script <scripty@kde.org>

Mar 21 2019, 4:56 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kmail/grammarplugins/grammalecte/plugin/kmail_grammalecteplugin.json
	M			kmail/grammarplugins/languagetool/plugin/kmail_languagetoolplugin.json
	M			plugins/messageviewerconfigureplugins/dkim-verify/messageviewer_dkimconfigplugin.json