SVN_SILENT made messages (.desktop file) - always resolve ours
2c86ffe0a508
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

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			microblogs/friendica/choqok_friendica.desktop
	M			microblogs/laconica/choqok_laconica.desktop
	M			microblogs/pumpio/choqok_pumpio.desktop
	M			plugins/longurl/choqok_longurl.desktop
	M			plugins/searchaction/choqok_searchaction.desktop