SVN_SILENT made messages (.desktop file) - always resolve ours
8a7c1e057922
Actions

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

Jan 16 2019, 4:52 AM

Parents

R119:fd94db08a555: Improve the Splash Screen KCM

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kcms/cursortheme/kcm_cursortheme.desktop
	P			kcms/cursortheme/package/metadata.desktop Copied from kcms/cursortheme/xcursor/xcursor.knsrc
	M			kcms/desktoptheme/kcm_desktoptheme.desktop
	M			kcms/desktoptheme/package/metadata.desktop
	M			kcms/ksplash/kcm_splashscreen.desktop
	M			kcms/ksplash/package/metadata.desktop
	M			kcms/lookandfeel/kcm_lookandfeel.desktop
	M			kcms/lookandfeel/package/metadata.desktop