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

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

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/migration/mdb/src/keximdb/keximigrate_mdb.json
	M			src/migration/mysql/keximigrate_mysql.json
	M			src/migration/postgresql/keximigrate_postgresql.json
	M			src/migration/tsv/keximigrate_tsv.json
	M			src/migration/xbase/keximigrate_xbase.desktop
	M			src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json
	M			src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json
	M			src/plugins/reports/kexi_reportplugin.desktop