CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:        /cvs
Module name:    ports
Changes by:     ajacou...@cvs.openbsd.org       2013/03/29 10:53:22

Modified files:
        net/telepathy/folks: Makefile 
        net/telepathy/folks/pkg: PLIST 

Log message:
Fix @conflict marker.