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

Authored by l10n daemon script <scripty@kde.org> on Oct 20 2019, 6:56 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 20 2019, 6:56 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			categories/old/settings-application-and-system-notifications.desktop
	M			categories/old/settings-application-appearance.desktop
	M			categories/settings-appearance-applicationstyle.desktop
	M			core/systemsettingsexternalapp.desktop