From 6bcd7f9a036f91d336606f33fd5d5764cf71245c Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 10 Jan 1996 22:15:13 +0000
Subject: [PATCH] merge error

---
 usr.sbin/syslogd/syslogd.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 842497deab6..9ac442243a6 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -282,9 +282,6 @@ main(argc, argv)
 		finet = -1;
 		inetm = 0;
 	}
-	if (finet >= 0) {
-		struct servent *sp;
-	inetm = 0;
 	if (finet >= 0) {
 		struct servent *sp;
 
-- 
2.20.1