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

Authored by l10n daemon script <scripty@kde.org> on Dec 13 2017, 5:57 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>

Dec 13 2017, 5:57 AM

Parents

R32:605cefcaa48e: Merge branch '5.2'

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app/org.kde.kdevelop.desktop
	M			file_templates/classes/qabstractitemmodel/qabstractitemmodel.desktop
	M			file_templates/classes/qabstractitemmodel_pimpl/qabstractitemmodel_pimpl.desktop
	M			file_templates/classes/qdialog/qdialog.desktop
	M			file_templates/classes/qwidget_pimpl/qwidget_pimpl.desktop
	M			plugins/bazaar/org.kde.kdevelop_bzr.desktop
	M			plugins/git/org.kde.kdevelop_git.desktop
	M			plugins/subversion/org.kde.kdevelop_svn.desktop