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

Authored by l10n daemon script <scripty@kde.org> on Feb 13 2018, 6:02 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>

Feb 13 2018, 6:02 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate
	M			plugins/android/kdevandroid.json
	M			plugins/cmake/kdevcmakemanager.json
	M			plugins/docker/dockerfile-template/dockerfile-template.desktop
	M			plugins/gdb/kdevgdb.json
	M			plugins/ghprovider/kdevghprovider.json
	M			plugins/okteta/kdevokteta.json
	M			plugins/subversion/kdevsubversion.json