SVN_SILENT made messages (.desktop file) - always resolve ours
647cba059f1c
Actions

Authored by l10n daemon script <scripty@kde.org> on Mar 13 2018, 4:22 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>

Mar 13 2018, 4:22 AM

Parents

R119:cdb120f366c7: Add Qt5::Dbus

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kcms/baloo/kcm_baloofile.desktop
	M			kcms/componentchooser/componentservices/kcm_browser.desktop
	M			kcms/componentchooser/componentservices/kcm_filemanager.desktop
	M			kcms/componentchooser/componentservices/kcm_kemail.desktop
	M			kcms/componentchooser/componentservices/kcm_terminal.desktop
	M			kcms/runners/kcm_plasmasearch.desktop
	M			runners/plasma-desktop/plasma-runner-plasma-desktop.desktop