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

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

Parents

R223:4a80d3f963b9: Fix crash when exporting

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			generators/chm/libokularGenerator_chmlib.json
	M			generators/comicbook/libokularGenerator_comicbook.json
	M			generators/djvu/libokularGenerator_djvu.json
	M			generators/dvi/libokularGenerator_dvi.json
	M			generators/epub/libokularGenerator_epub.json
	M			generators/fax/libokularGenerator_fax.json
	M			generators/fictionbook/libokularGenerator_fb.json
	M			generators/kimgio/libokularGenerator_kimgio.json
	M			generators/markdown/libokularGenerator_md.json
	M			generators/mobipocket/libokularGenerator_mobi.json
	M			generators/ooo/libokularGenerator_ooo.json
	M			generators/plucker/libokularGenerator_plucker.json
	M			generators/poppler/libokularGenerator_poppler.json
	M			generators/spectre/libokularGenerator_ghostview.json
	M			generators/tiff/libokularGenerator_tiff.json
	M			generators/txt/libokularGenerator_txt.json
	M			generators/xps/libokularGenerator_xps.json