CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:        /cvs
Module name:    ports
Changes by:     na...@cvs.openbsd.org   2017/10/01 12:54:27

Modified files:
        telephony/asterisk-sounds/core-sounds/en: Makefile 
        telephony/asterisk-sounds/core-sounds/en_GB: Makefile 
        telephony/asterisk-sounds/core-sounds/fr: Makefile 
        telephony/asterisk-sounds/core-sounds/pkg: PLIST-en PLIST-en_GB 
                                                   PLIST-fr 

Log message:
fix @conflict; from sthen@