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

Authored by l10n daemon script <scripty@kde.org> on May 14 2017, 2:11 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

eliakinalmeida

May 25 2017, 1:03 AM

Parents

R37:33504b90a501: Disable tile data pool

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/extensions/pykrita/plugin/plugins/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/extensions/pykrita/plugin/plugins/hello/kritapykrita_hello.desktop
	M			plugins/extensions/pykrita/plugin/plugins/highpass/kritapykrita_highpass.desktop
	M			plugins/extensions/pykrita/plugin/plugins/scripter/kritapykrita_scripter.desktop
	M			plugins/extensions/pykrita/plugin/plugins/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/extensions/pykrita/plugin/plugins/tenbrushes/kritapykrita_tenbrushes.desktop