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

Authored by l10n daemon script <scripty@kde.org> on May 10 2017, 5:42 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>

May 10 2017, 5:42 AM

Parents

R108:d15cb52682ca: [DRM plugin] Correct Atomic Mode Setting

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			effects/logout/package/metadata.desktop
	M			kcmkwin/kwincompositing/kwineffect.knsrc
	M			kcmkwin/kwinscripts/kwinscripts.knsrc
	M			kcmkwin/kwintabbox/kwinswitcher.knsrc
	M			packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
	M			packageplugins/decoration/kwin-packagestructure-decoration.desktop
	M			plugins/kdecorations/aurorae/src/aurorae.knsrc