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

Authored by l10n daemon script <scripty@kde.org> on Mar 2 2019, 4:42 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>

Mar 2 2019, 4:42 AM

Parents

R261:e8708ba84906: Merge remote-tracking branch 'origin/5.0'

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kmymoney/plugins/checkprinting/checkprinting.json.cmake
	M			kmymoney/plugins/csv/export/csvexporter.json.cmake
	M			kmymoney/plugins/csv/import/csvimporter.json.cmake
	M			kmymoney/plugins/gnc/import/gncimporter.json.cmake
	M			kmymoney/plugins/ibanbicdata/ibanbicdata.json.cmake
	M			kmymoney/plugins/icalendar/export/icalendarexporter.json.cmake
	M			kmymoney/plugins/kbanking/kbanking.json.cmake
	M			kmymoney/plugins/ofx/import/ofximporter.json.cmake
	M			kmymoney/plugins/onlinejobpluginmockup/onlinejobpluginmockup.json.cmake
	M			kmymoney/plugins/qif/export/qifexporter.json.cmake
	M			kmymoney/plugins/qif/import/qifimporter.json.cmake
	M			kmymoney/plugins/reconciliationreport/reconciliationreport.json.cmake
	M			kmymoney/plugins/views/onlinejoboutbox/onlinejoboutboxview.json.cmake
	M			kmymoney/plugins/weboob/weboob.json.cmake