SVN_SILENT made messages (.desktop file) - always resolve ours
5306260e9ac9
Actions

Authored by l10n daemon script <scripty@kde.org> on Dec 7 2019, 4:39 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>

Dec 7 2019, 4:39 AM

Parents

R124:3095645414d9: Merge branch 'Plasma/5.17'

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			categories/old/settings-account-details.desktop
	M			categories/old/settings-application-appearance.desktop
	M			categories/old/settings-desktop-appearance.desktop
	M			categories/old/settings-display.desktop
	M			categories/old/settings-input-devices.desktop
	M			categories/old/settings-locale.desktop
	M			categories/old/settings-power-management.desktop
	M			categories/old/settings-startup-and-shutdown.desktop
	M			categories/old/settings-workspace-appearance-and-behavior.desktop
	M			categories/settings-hardware-display.desktop
	M			categories/settings-hardware-input.desktop
	M			categories/settings-hardware-peripherals.desktop
	M			categories/settings-hardware-powermanagement.desktop
	M			categories/settings-hardware-removable-storage.desktop
	M			categories/settings-personalization-accountdetails.desktop
	M			categories/settings-workspace-session.desktop
	M			categories/settings-workspace-windowmanagement.desktop
	M			categories/settings-workspace.desktop