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

Authored by l10n daemon script <scripty@kde.org> on May 26 2019, 3:12 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>

May 26 2019, 3:12 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/mousepad/kdeconnect_mousepad.json
	M			plugins/notifications/kdeconnect_notifications.json
	M			plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json