SVN_SILENT made messages (.desktop file) - always resolve ours
79ad1310b961
Actions

Authored by l10n daemon script <scripty@kde.org> on May 9 2019, 4:03 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>

May 9 2019, 4:03 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/plugin_importer/kritapykrita_plugin_importer.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop