SVN_SILENT made messages (.desktop file) - always resolve ours
9a6cc89e9a5e
Actions

Authored by l10n daemon script <scripty@kde.org> on Sep 5 2018, 5:50 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>

Sep 5 2018, 5:50 AM

Parents

R261:15536551eaed: Fix Windows builds

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kmymoney/plugins/views/forecast/kcm_forecastview.desktop
	M			kmymoney/plugins/views/reports/kcm_reportsview.desktop
	M			kmymoney/plugins/xml/kcm_xmlstorage.desktop