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

Authored by l10n daemon script <scripty@kde.org> on Jun 30 2016, 3:35 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 30 2016, 3:35 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			simon/src/simonappcore/simongeneralconfig.desktop
	M			simond/src/config/simondnetworkconfiguration.desktop
	M			simond/src/config/simonduserconfiguration.desktop
	M			simonlib/simonactions/simonactionsconfig.desktop
	M			simonlib/simontts/config/simonttsconfig.desktop