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

Authored by l10n daemon script <scripty@kde.org> on Dec 6 2018, 4:47 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 6 2018, 4:47 AM

Parents

R119:02ef57d37b2c: Merge branch 'Plasma/5.14'

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