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

Authored by l10n daemon script <scripty@kde.org> on Mar 5 2019, 5:02 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>

Mar 5 2019, 5:02 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			dataengines/potd/apodprovider.json
	M			dataengines/potd/bingprovider.json
	M			dataengines/potd/epodprovider.json
	M			dataengines/potd/flickrprovider.json
	M			dataengines/potd/natgeoprovider.json
	M			dataengines/potd/noaaprovider.json
	M			dataengines/potd/wcpotdprovider.json