SVN_SILENT made messages (.desktop file) - always resolve ours
6e8e455aae6a
Actions

Authored by l10n daemon script <scripty@kde.org> on Apr 28 2019, 3:48 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>

Apr 28 2019, 3:48 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			applets/minimizeall/package/metadata.desktop
	M			applets/showdesktop/package/metadata.desktop
	M			kcms/colors/kcm_colors.desktop
	M			kcms/colors/package/metadata.desktop
	M			kcms/colors/schemes/Honeycomb.colors
	M			kcms/colors/schemes/ObsidianCoast.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/emoticons/emoticons.desktop
	M			kcms/fonts/kcm_fonts.desktop
	M			kcms/fonts/package/metadata.desktop
	M			kcms/icons/kcm_icons.desktop
	M			kcms/icons/package/metadata.desktop
	M			kcms/kfontinst/kcmfontinst/fontinst.desktop
	M			kcms/ksmserver/kcmsmserver.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
	M			kcms/style/style.desktop