From c4f0e9c41278ced04a6ca23ae8326070aeae292f Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 7 Jul 2017 15:46:31 +1000 Subject: [PATCH] address merge error --- README.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c95302dd23..30765904e2 100644 --- a/README.md +++ b/README.md @@ -277,15 +277,9 @@ CVE-2017-3137, and CVE-2017-3138. #### BIND 9.10.6 -<<<<<<< HEAD -BIND 9.10.6 is a maintenance release, and addresses the security flaws -disclosed in CVE-2017-3140 and CVE-2017-3141. -======= -BIND 9.11.2 is a maintenance release, and addresses the security flaws -disclosed in CVE-2017-3140, CVE-2017-3141, CVE-2017-3142 and CVE-2017-3143. -It also addresses several bugs related to the use of an LMDB database to -store data related to zones added via `rndc addzone` or catalog zones. ->>>>>>> a03f4b1... [v9_11] address TSIG bypass/forgery vulnerabilities +BIND 9.10.6 is a maintenance release, and addresses the security +flaws disclosed in CVE-2017-3140 and CVE-2017-3141, CVE-2017-3142 +and CVE-2017-3143. ### Building BIND