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

Authored by l10n daemon script <scripty@kde.org> on Oct 2 2016, 9:33 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>

Oct 2 2016, 9:33 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			effects/dialogparent/package/metadata.desktop
	M			kcmkwin/kwincompositing/kcmkwineffects.desktop
	M			kcmkwin/kwinoptions/kwinoptions.desktop
	M			kcmkwin/kwinrules/kwinrules.desktop