CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:        /cvs
Module name:    ports
Changes by:     jas...@cvs.openbsd.org  2013/02/04 00:55:26

Modified files:
        graphics/py-Imaging: Makefile 
        graphics/py-Imaging/pkg: PLIST-bin PLIST-main 

Log message:
add conflict markers with py-Pillow.