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

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

Parents

R36:1074bf07a9b9: Refactor CliInterface

Branches

Unknown

Tags

Unknown

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