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

Authored by l10n daemon script <scripty@kde.org> on Aug 21 2016, 9:21 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>

Aug 21 2016, 9:21 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app/org.kde.kdevelop.desktop
	M			app/org.kde.kdevelop_ps.desktop
	M			app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.kdevtemplate
	M			app_templates/cpp/QMake/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate
	M			app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate
	M			file_templates/testing/cpp_cpputest/cpp_cpputest.desktop
	M			file_templates/testing/cpp_gtest/cpp_gtest.desktop