SVN_SILENT made messages (.desktop file) - always resolve ours
64f336c8e61a
Actions

Authored by l10n daemon script <scripty@kde.org> on Aug 27 2018, 3: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>

Aug 27 2018, 3:52 AM

Parents

R119:b717bc0bc6b7: Merge branch 'Plasma/5.13'

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kcms/knotify/kcmnotify.desktop
	M			kcms/phonon/kcm_phonon.desktop
	M			kcms/solid_actions/device-actions/solid-device-OpticalDrive.desktop
	M			kcms/solid_actions/device-actions/solid-device-StorageDrive.desktop