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

Authored by l10n daemon script <scripty@kde.org> on Aug 2 2017, 6:21 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>

Aug 2 2017, 6:21 AM

Parents

R37:4aa6ce8bff03: Fix forgotten brackets, fix build.

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/extensions/pykrita/plugin/plugins/colorspace/kritapykrita_colorspace.desktop
	M			plugins/extensions/pykrita/plugin/plugins/documenttools/kritapykrita_documenttools.desktop
	M			plugins/extensions/pykrita/plugin/plugins/exportlayers/kritapykrita_exportlayers.desktop
	M			plugins/extensions/pykrita/plugin/plugins/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/extensions/pykrita/plugin/plugins/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/extensions/pykrita/plugin/plugins/scriptdocker/kritapykrita_scriptdocker.desktop