CVS commit: src/external/bsd/nsd

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Mon Sep  3 11:40:09 UTC 2018

Modified Files:
        src/external/bsd/nsd/include: config.h
Removed Files:
        src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h
            zlexer.c zparser.c zparser.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/nsd/dist/configlexer.c \
    src/external/bsd/nsd/dist/configparser.c \
    src/external/bsd/nsd/dist/configparser.h \
    src/external/bsd/nsd/dist/zlexer.c src/external/bsd/nsd/dist/zparser.c \
    src/external/bsd/nsd/dist/zparser.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/include/config.h

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