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

Authored by l10n daemon script <scripty@kde.org> on Mar 17 2016, 9:58 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>

Mar 17 2016, 9:58 AM

Parents

R36:b1c972fac973: Fix missing Title Capitalizations

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/clirarplugin/kerfuffle_clirar.json
	M			plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.json
	M			plugins/libsinglefileplugin/kerfuffle_libbz2.json
	M			plugins/libsinglefileplugin/kerfuffle_libgz.json
	M			plugins/libsinglefileplugin/kerfuffle_libxz.json