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

Authored by l10n daemon script <scripty@kde.org> on Apr 4 2020, 4:21 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>

Apr 4 2020, 4:21 AM

Parents

R15:26921d05bd2f: Merge remote-tracking branch 'origin/3.2'

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