From 7bc6c49b127c0806618143892051b391c0efc873 Mon Sep 17 00:00:00 2001 From: Hans Insulander Date: Thu, 19 Oct 2000 18:21:28 +0000 Subject: Remove merge conflict marker accidentaly left in this file. --- share/man/man4/bridge.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4 index ca36a3a046f..508a7e576ad 100644 --- a/share/man/man4/bridge.4 +++ b/share/man/man4/bridge.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bridge.4,v 1.25 2000/10/18 16:32:11 aaron Exp $ +.\" $OpenBSD: bridge.4,v 1.26 2000/10/19 18:21:27 hin Exp $ .\" .\" Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) .\" All rights reserved. @@ -464,7 +464,6 @@ struct ifbrlconf { #define ifbrl_req ifbrl_ifbrlu.ifbrlu_req }; .Ed ->>>>>>> 1.17 .El .Sh ERRORS If the -- cgit v1.2.3