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

Authored by l10n daemon script <scripty@kde.org> on Apr 23 2019, 4:05 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"

Details

Committed

l10n daemon script <scripty@kde.org>

Apr 23 2019, 4:05 AM

Parents

R37:699acd314491: BUG:403140 Hide pattern fill for vector shapes until it is implemented

Branches

Unknown

Tags

Unknown

References

refs/keep-around/ddbc6716ef31420b6c9260a25a3532d9488f822a

l10n daemon script <scripty@kde.org> committed R37:ddbc6716ef31: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 23 2019, 4:05 AM

Changes (29)

				Path	Packages
	M			krita/data/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508,300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/web_design.desktop
	M			krita/data/templates/dslr/Canon_550D_5184x3456.desktop
	M			krita/data/templates/dslr/Canon_5Dmk3_5760x3840.desktop
	M			krita/data/templates/dslr/Nikon_D3000_3872x2592.desktop
	M			krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop
	M			krita/data/templates/dslr/Nikon_D7000_4928x3264.desktop
	M			plugins/python/colorspace/kritapykrita_colorspace.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
	M			plugins/python/documenttools/kritapykrita_documenttools.desktop
	M			plugins/python/exportlayers/kritapykrita_exportlayers.desktop
	M			plugins/python/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/python/hello/kritapykrita_hello.desktop
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/plugin_importer/kritapykrita_plugin_importer.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
	M			plugins/python/scripter/kritapykrita_scripter.desktop
	M			plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop