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

Authored by l10n daemon script <scripty@kde.org> on Jan 8 2018, 3:49 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>

Jan 8 2018, 3:49 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/cli7zplugin/kerfuffle_cli7z.json.cmake
	M			plugins/clirarplugin/kerfuffle_clirar.json.cmake
	M			plugins/libsinglefileplugin/kerfuffle_libbz2.json.cmake
	M			plugins/libsinglefileplugin/kerfuffle_libgz.json.cmake
	M			plugins/libsinglefileplugin/kerfuffle_libxz.json.cmake
	M			plugins/libzipplugin/kerfuffle_libzip.json.cmake