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

Authored by l10n daemon script <scripty@kde.org> on Nov 10 2017, 3:49 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 10 2017, 3:49 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app_templates/empty/empty.kdevtemplate
	M			file_templates/testing/cpp_gtest/cpp_gtest.desktop
	M			plugins/appwizard/kdevappwizard.knsrc
	M			plugins/filetemplates/kdevfiletemplates.knsrc
	M			plugins/qthelp/kdevelop-qthelp.knsrc