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

Authored by l10n daemon script <scripty@kde.org> on Nov 25 2016, 4:02 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>

Nov 25 2016, 4:02 AM

Parents

R15:78aa0a54da69: Merge branch '3.0'

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/drivers/mysql/kdb_mysqldriver.json
	M			src/drivers/postgresql/kdb_postgresqldriver.json
	M			src/drivers/sqlite/kdb_sqlitedriver.json
	M			src/drivers/sybase/kdb_sybasedriver.json
	M			src/drivers/xbase/kdb_xbasedriver.json