SVN_SILENT made messages (.desktop file) - always resolve ours
4aa709c2c15c
Actions

Authored by l10n daemon script <scripty@kde.org> on Jul 31 2019, 7:35 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>

Jul 31 2019, 7:35 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kaccess/kaccess.notifyrc
	M			kcms/access/kcmaccess.desktop
	M			kcms/autostart/autostart.desktop
	M			kcms/componentchooser/componentservices/kcm_browser.desktop
	M			kcms/componentchooser/componentservices/kcm_kemail.desktop
	M			kcms/componentchooser/componentservices/kcm_terminal.desktop
	M			kcms/dateandtime/kcmclock_actions.actions
	M			kcms/launch/kcmlaunch.desktop
	M			kcms/touchpad/src/kcm/kcm_touchpad.desktop