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

Authored by l10n daemon script <scripty@kde.org> on Feb 22 2018, 4:20 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>

Feb 22 2018, 4:20 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kcms/nightcolor/kcm_nightcolor.desktop
	M			kcms/nightcolor/package/metadata.desktop
	M			layout-templates/org.kde.plasma.desktop.appmenubar/metadata.desktop
	M			layout-templates/org.kde.plasma.desktop.defaultPanel/metadata.desktop
	M			layout-templates/org.kde.plasma.desktop.emptyPanel/metadata.desktop