CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:        /cvs
Module name:    ports
Changes by:     z...@cvs.openbsd.org    2013/12/25 08:36:27

Modified files:
        x11/kde4/libkipi: Makefile 
        x11/kde4/libkipi/pkg: PLIST-icons 

Log message:
Fix conflict marker for -icons.