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

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

Apr 24 2017, 2:03 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	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