From: Mark Andrews <marka@isc.org>
Date: Thu, 26 Jul 2012 03:10:58 +0000 (+1000)
Subject: remove conflict marker
X-Git-Tag: v9.7.7rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b7ce3c8b32ffaf62514f8d4575613d1473ab074;p=thirdparty%2Fbind9.git

remove conflict marker
---

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 1f0056eb9a8..11ee27b33ad 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -37,7 +37,6 @@ DNSDEPLIBS =	../libdns.@A@
 LIBS =		@LIBS@ @ATFLIBS@
 
 OBJS =		dnstest.@O@
-<<<<<<< HEAD
 SRCS =		dnstest.c master_test.c time_test.c dbiterator_test.c \
 		dbversion_test.c zonemgr_test.c nsec3_test.c rdataset_test.c