CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

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

Modified files:
        x11/gnome/file-roller: Makefile 
        x11/gnome/file-roller/pkg: PLIST 

Log message:
Missing conflict marker.