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

Authored by l10n daemon script <scripty@kde.org> on Oct 28 2019, 4:17 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>

Oct 28 2019, 4:17 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app_templates/c/CMake/cmake_plainc/cmake_plainc.kdevtemplate
	M			app_templates/cpp/CMake/cmake_plaincpp/cmake_plaincpp.kdevtemplate
	M			app_templates/cpp/CMake/cmake_qt5-qml2/cmake_qt5-qml2.kdevtemplate
	M			app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate
	M			app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate
	M			app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate
	M			plugins/appwizard/kdevappwizard.json
	M			plugins/appwizard/kdevappwizard.knsrc
	M			plugins/externalscript/kdevexternalscript.json
	M			plugins/openwith/kdevopenwith.json