From f1157334e40d67dbd741552628ed55803976a113 Mon Sep 17 00:00:00 2001
From: mellon <mellon@NetBSD.org>
Date: Sat, 8 Jul 2000 20:53:57 +0000
Subject: [PATCH] Oops, fix one more conflict.

---
 usr.sbin/dhcp/common/options.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/usr.sbin/dhcp/common/options.c b/usr.sbin/dhcp/common/options.c
index 7fd55ad9c200..ff312cfc1a85 100644
--- a/usr.sbin/dhcp/common/options.c
+++ b/usr.sbin/dhcp/common/options.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: options.c,v 1.6 2000/07/08 20:52:12 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: options.c,v 1.7 2000/07/08 20:53:57 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #define DHCP_OPTION_DATA
@@ -672,18 +672,11 @@ const char *pretty_print_option (code, data, len, emit_commas, emit_quotes)
 			      case 't':
 				if (emit_quotes)
 					*op++ = '"';
-<<<<<<< options.c
-				for (; dp < data + len; dp++) {
-					if (!isascii (*dp) ||
-					    !isprint (*dp)) {
-						sprintf (op, "\\\\%03o", *dp);
-=======
 				for (; dp < data + len; dp++) {
 					if (!isascii (*dp) ||
 					    !isprint (*dp)) {
 						sprintf (op, "\\%03o",
 							 *dp);
->>>>>>> 1.1.1.13
 						op += 4;
 					} else if (*dp == '"' ||
 						   *dp == '\'' ||