remove conflict marker

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 1f0056eb9a8012791f34a3495edc5211d3ae2eb6..11ee27b33ad945aa90b1c9cdfc4e38668c7dad8b 100644 (file)
--- 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