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

Authored by l10n daemon script <scripty@kde.org>.

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 9 2016, 9:59 AM

Parents

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R8:ae439d413452: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 9 2016, 9:59 AM

				Path	Packages
	M			extras/okularodpgenerator/libokularGenerator_odp.json
	M			extras/okularodtgenerator/libokularGenerator_odt.json
	M			filters/stage/powerpoint/libokularGenerator_ppt.json
	M			filters/stage/pptx/libokularGenerator_pptx.json
	M			filters/words/docx/import/libokularGenerator_docx.json
	M			filters/words/msword-odf/libokularGenerator_doc.json
	M			filters/words/wordperfect/import/libokularGenerator_wpd.json