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

Authored by l10n daemon script <scripty@kde.org> on Sep 22 2018, 4:00 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>

Sep 22 2018, 4:00 AM

Parents

R32:ace3f20bdac1: Merge branch '5.3'

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/clazy/kdevclazy.json
	M			plugins/cppcheck/kdevcppcheck.json
	M			plugins/custom-buildsystem/kdevcustombuildsystem.json
	M			plugins/ghprovider/kdevghprovider.json
	M			plugins/lldb/kdevlldb.json
	M			plugins/okteta/kdevokteta.json
	M			plugins/perforce/kdevperforce.json
	M			plugins/subversion/kdevsubversion.json
	M			plugins/welcomepage/kdevwelcomepage.json