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

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

Jun 18 2018, 3:35 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kaccess/kaccess.notifyrc
	M			kcms/access/kcmaccess.desktop
	M			kcms/keyboard/kcm_keyboard.desktop
	M			kcms/keys/keys.desktop
	M			kcms/mouse/mouse.desktop
	M			kcms/phonon/kcm_phonon.desktop
	M			kcms/spellchecking/spellchecking.desktop
	M			kcms/standard_actions/standard_actions.desktop
	M			kcms/workspaceoptions/kcm_workspace.desktop