From 48030ca50f930974bc8c347cb82dfedfe9522c6f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 29 Dec 2016 12:09:45 +1100
Subject: [PATCH] spelling

---
 CHANGES | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9d693cbe93..d6af284d1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -124,14 +124,7 @@
 
 4494.	[bug]		Look for <editline/readline.h>. [RT #43429]
 
-<<<<<<< HEAD
-4492.	[bug]		irs_resconf_load failed to initialise sortlistnxt
-=======
-4493.	[bug]		bin/tests/system/dyndb/driver/Makefile.in should use
-			SO_TARGETS. [RT# 43336]
-
 4492.	[bug]		irs_resconf_load failed to initialize sortlistnxt
->>>>>>> 91a54c6... spelling
 			causing bad writes if resolv.conf contained a
 			sortlist directive. [RT #43459]