Missed a conflict

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 7bd8f9b3cee18eb12e1df7a160906623b97279f6..ea09a91c6dff75d2dae14dc43d74c1c5e1ad45bf 100644 (file)
--- 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;