Some more merge fixes
a0af668b930c
Actions

Authored by rempt on Oct 16 2018, 11:50 AM.

Description

Some more merge fixes

Committed

rempt

Oct 16 2018, 11:50 AM

Parents

R37:da961c4cd106: Fix build

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/widgets/KisPaletteListWidget_p.h
	M			libs/widgets/KoLegacyResourceModel.h