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

Authored by l10n daemon script <scripty@kde.org> on Dec 18 2016, 4:35 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>

Dec 18 2016, 4:35 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app/compressfileitemaction.json
	M			app/extractfileitemaction.json
	M			kerfuffle/kerfufflePlugin.desktop
	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
	M			plugins/libarchive/kerfuffle_libarchive.json.cmake
	M			plugins/libsinglefileplugin/kerfuffle_libbz2.json.cmake
	M			plugins/libsinglefileplugin/kerfuffle_libgz.json.cmake
	M			plugins/libsinglefileplugin/kerfuffle_libxz.json.cmake