From d4b59ed307bb2b1006558a435bb41a28c112ab39 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 1 Jun 2012 21:10:57 +1000
Subject: [PATCH] fixup merge conflict

---
 CHANGES | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 46cf85c94c..704739a20e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,14 +4,10 @@
 			they fail to validate, we try again in lower case.
 			[RT #27451]
 
-<<<<<<< HEAD
-	--- 9.6-ESV-R7 released ---
-=======
 3328.   [bug]           Fixed inconsistent data checking in dst_parse.c.
                         [RT #29401]
 
-	--- 9.7.6 released ---
->>>>>>> fdfd260... fix check_data() usage
+	--- 9.6-ESV-R7 released ---
 
 3318.	[tuning]	Reduce the amount of work performed while holding a
 			bucket lock when finshed with a fetch context.