CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:        /cvs
Module name:    ports
Changes by:     st...@cvs.openbsd.org   2014/04/08 18:41:47

Modified files:
        telephony/asterisk-sounds/moh-opsound: Makefile 
        telephony/asterisk-sounds/moh-opsound/pkg: PLIST 

Log message:
fix conflict markers, same as update problem with core-sounds reported by brad@