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

Authored by l10n daemon script <scripty@kde.org> on Jul 21 2016, 10:08 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 21 2016, 10:08 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			applets/systemmonitor/memory/metadata.desktop
	M			containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
	M			menu/desktop/kf5-system.directory
	M			menu/desktop/kf5-utilities-file.directory
	M			menu/desktop/kf5-utilities.directory
	M			phonon/platform_kde/phonon.notifyrc