SVN_SILENT made messages (.desktop file) - always resolve ours
9e35a80e4a2b
Actions

Authored by l10n daemon script <scripty@kde.org> on May 16 2019, 7:17 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>

May 16 2019, 7:17 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
	M			kcms/cursortheme/kcm_cursortheme.desktop
	M			kcms/cursortheme/package/metadata.desktop
	M			kcms/desktoptheme/kcm_desktoptheme.desktop
	M			kcms/desktoptheme/package/metadata.desktop
	M			kcms/input/mouse.desktop
	M			kcms/ksplash/kcm_splashscreen.desktop
	M			kcms/ksplash/package/metadata.desktop
	M			kcms/lookandfeel/kcm_lookandfeel.desktop
	M			kcms/lookandfeel/lookandfeel.knsrc
	M			kcms/lookandfeel/package/metadata.desktop