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

Authored by l10n daemon script <scripty@kde.org> on Dec 12 2018, 5:11 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>

Dec 12 2018, 5:11 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kcms/colors/schemes/Honeycomb.colors
	M			kcms/colors/schemes/Norway.colors
	M			kcms/colors/schemes/ObsidianCoast.colors
	M			kcms/colors/schemes/Oxygen.colors
	M			kcms/colors/schemes/OxygenCold.colors
	M			kcms/colors/schemes/Steel.colors
	M			kcms/colors/schemes/WontonSoup.colors
	M			kcms/colors/schemes/Zion.colors
	M			kcms/colors/schemes/ZionReversed.colors