SVN_SILENT made messages (.desktop file) - always resolve ours
92178e8a89c3
Actions

Authored by l10n daemon script <scripty@kde.org> on Nov 20 2019, 4:30 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>

Nov 20 2019, 4:30 AM

Parents

R37:2d4ae8c38295: Get exiv from our own download location

Branches

Unknown

Tags

Unknown

References

refs/keep-around/92178e8a89c3703de03ebfcdaa9866e39721a3ff

				Path	Packages
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop