CVS commit: pkgsrc/parallel

["Aleksej Saushev" <asau%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   asau
Date:           Thu Feb 28 07:18:16 UTC 2013

Modified Files:
        pkgsrc/parallel/mpi-ch: Makefile
        pkgsrc/parallel/openmpi: Makefile

Log Message:
Drop manual conflict registration, it conflicts with what we intend to do.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/parallel/mpi-ch/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/parallel/openmpi/Makefile

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