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

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

Sep 17 2016, 9:33 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			karbon/stencils/Assorted/octagon.desktop
	M			karbon/stencils/Cisco/data_center_switch.desktop
	M			karbon/stencils/Cisco/data_center_switch_reversed.desktop
	M			karbon/stencils/MSE/node_center.desktop