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

Authored by l10n daemon script <scripty@kde.org> on Apr 9 2020, 4:18 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>

Apr 9 2020, 4:18 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			skgbankmodeler/currency/aed.desktop
	M			skgbankmodeler/sources/org.kde.skrooge-source-coinmarketcap.desktop
	M			skgbankmodeler/sources/org.kde.skrooge-source-cryptocompare.desktop