From: Michael Sawyer <source@isc.org>
Date: Tue, 17 Oct 2000 00:36:09 +0000 (+0000)
Subject: Missed a conflict
X-Git-Tag: v9.0.1^4~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92b35cdef887243d744a0c6459fa23f8275ab4b7;p=thirdparty%2Fbind9.git

Missed a conflict
---

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 7bd8f9b3cee..ea09a91c6df 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.148 2000/10/17 00:35:18 mws Exp $ */
+/* $Id: dighost.c,v 1.149 2000/10/17 00:36:09 mws Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -2181,11 +2181,6 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 	UNUSED(task);
 	INSIST(!free_now);
 
-<<<<<<< dighost.c
-=======
-	if (show_packets)
-		puts(";; beginning of DNS packet");
->>>>>>> 1.147
 	debug("recv_done()");
 
 	LOCK_LOOKUP;