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

Authored by l10n daemon script <scripty@kde.org> on Apr 19 2018, 5:07 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>

Apr 19 2018, 5:07 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app/org.kde.latte-dock.desktop.cmake
	M			applets/separator/metadata.desktop.cmake
	M			applets/separator/package/metadata.desktop
	M			containment/metadata.desktop.cmake
	M			containment/package/metadata.desktop
	M			shell/package/contents/controls/latte-separator.desktop