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

Authored by l10n daemon script <scripty@kde.org> on Nov 28 2016, 4:29 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 28 2016, 4:29 AM

Parents

R36:864d77f14c28: Properly kill BatchExtract jobs

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/cli7zplugin/kerfuffle_cli7z.json.cmake
	M			plugins/clirarplugin/kerfuffle_clirar.json.cmake
	M			plugins/clizipplugin/kerfuffle_clizip.json.cmake