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

Authored by l10n daemon script <scripty@kde.org> on May 25 2017, 3:37 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>

May 25 2017, 3:37 AM

Parents

Branches

Unknown

Tags

Unknown

References

tag: v17.04.2

				Path	Packages
	M			khelpcenter.desktop
	M			org.kde.Help.desktop
	M			plugins/browsercontrolmodules.desktop
	M			plugins/filemanagercontrolmodules.desktop
	M			plugins/fundamentals.desktop
	M			plugins/kcontrolmodules.desktop
	M			plugins/konquerorcontrolmodules.desktop
	M			plugins/othercontrolmodules.desktop