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

Authored by l10n daemon script <scripty@kde.org> on Jul 30 2017, 2:47 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>

Jul 30 2017, 2:47 AM

Parents

R71:e2b9e817875e: GIT_SILENT --warnings

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/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json
	M			src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json
	M			src/plugins/migration/kexi_migrationplugin.desktop