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

Authored by l10n daemon script <scripty@kde.org> on Nov 14 2018, 7:01 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 14 2018, 7:01 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/astyle/kdevastyle.json
	M			plugins/gdb/kdevgdb.json
	M			plugins/problemreporter/kdevproblemreporter.json
	M			plugins/sourceformatter/kdevsourceformatter.json