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

Authored by l10n daemon script <scripty@kde.org> on Nov 26 2018, 4:24 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>

Nov 26 2018, 4:24 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			addons/filetree/katefiletreeplugin.desktop
	M			addons/konsole/katekonsoleplugin.desktop
	M			addons/replicode/katereplicodeplugin.desktop
	M			addons/snippets/katesnippetsplugin.desktop