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

Authored by l10n daemon script <scripty@kde.org> on Apr 5 2020, 3:57 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 5 2020, 3:57 AM

Parents

Branches

Unknown

Tags

Unknown

References

refs/keep-around/5a1f66ff4ae7872538c6832d69ba85ffb8072979

				Path	Packages
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop