[Midnightbsd-cvs] src: contrib/bind96: Resolve merge conflicts.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Resolve merge conflicts.

Modified Files:
--------------
    src/contrib/bind96/lib/dns:
        ncache.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/bind96/lib/dns/ncache.c?r1=1.2&r2=1.3)

Removed Files:
-------------
    src/contrib/bind96:
        RELEASE-NOTES-BIND-9.6.3.html
        (http://cvsweb.midnightbsd.org/src/contrib/bind96/RELEASE-NOTES-BIND-9.6.3.html)
        RELEASE-NOTES-BIND-9.6.3.pdf
        (http://cvsweb.midnightbsd.org/src/contrib/bind96/RELEASE-NOTES-BIND-9.6.3.pdf)
        RELEASE-NOTES-BIND-9.6.3.txt
        (http://cvsweb.midnightbsd.org/src/contrib/bind96/RELEASE-NOTES-BIND-9.6.3.txt)
    src/contrib/bind96/doc/draft:
        draft-ietf-dnsext-rfc2671bis-edns0-02.txt
        (http://cvsweb.midnightbsd.org/src/contrib/bind96/doc/draft/draft-ietf-dnsext-rfc2671bis-edns0-02.txt)
        draft-ietf-dnsop-dnssec-key-timing-00.txt
        (http://cvsweb.midnightbsd.org/src/contrib/bind96/doc/draft/draft-ietf-dnsop-dnssec-key-timing-00.txt)