diff options
| author | Hans Insulander <hin@cvs.openbsd.org> | 2000-10-19 18:21:28 +0000 |
|---|---|---|
| committer | Hans Insulander <hin@cvs.openbsd.org> | 2000-10-19 18:21:28 +0000 |
| commit | 7bc6c49b127c0806618143892051b391c0efc873 (patch) | |
| tree | a2cc7dbf0cb1b4f9d90929f64c38d012ac1b5e2a | |
| parent | 89b9f42f7f56a97c16834c65a768c7817bc36114 (diff) | |
Remove merge conflict marker accidentaly left in this file.
| -rw-r--r-- | share/man/man4/bridge.4 | 3 |
1 files changed, 1 insertions, 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 |