CVSROOT: /cvs Module name: ports Changes by: jas...@cvs.openbsd.org 2016/01/16 12:35:31
Modified files:
converters/unoconv: Makefile
converters/unoconv/pkg: PLIST
textproc/odt2txt: Makefile
textproc/odt2txt/pkg: PLIST
Log message:
add conflict markers
