CVS commit: pkgsrc/misc/openoffice2-bin

[Christoph Badura <bad%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bad
Date:           Sun Dec  6 10:11:14 UTC 2009

Modified Files:
        pkgsrc/misc/openoffice2-bin: Makefile

Log Message:
Remove conflict marker in previous.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/misc/openoffice2-bin/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.