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

Authored by l10n daemon script <scripty@kde.org> on Jun 29 2017, 2:24 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>

Jun 29 2017, 2:24 AM

Parents

R14:284e80b63e15: Merge branch '3.0'

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/items/check/check.json
	M			src/items/field/field.json
	M			src/items/image/image.json
	M			src/items/label/label.json
	M			src/items/text/text.json
	M			src/plugins/barcode/kreport_barcodeplugin.json
	M			src/plugins/chart/kreport_chartplugin.json
	M			src/plugins/maps/kreport_mapsplugin.json
	M			src/plugins/web/kreport_webplugin.json