diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2000-08-03 05:04:19 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2000-08-03 05:04:19 +0000 |
| commit | 756dfeb7f4b334306f46114e351dbe8b3516203f (patch) | |
| tree | 1395aeddbbffa1c9fa0ac36239e10da23246e18a | |
| parent | 512236a12d50067ded4dd94ac1aa8c45ebf12d90 (diff) | |
fix conflict remnant; jakob@crt.se
| -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 f83819882f0..bb8c3023029 100644 --- a/share/man/man4/bridge.4 +++ b/share/man/man4/bridge.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bridge.4,v 1.22 2000/05/02 18:43:49 jason Exp $ +.\" $OpenBSD: bridge.4,v 1.23 2000/08/03 05:04:18 jason Exp $ .\" .\" Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) .\" All rights reserved. @@ -308,7 +308,6 @@ should be set to to flush all addresses from the cache or .Ar IFBF_FLUSHDYN to flush only the dynamically learned addresses from the cache. -<<<<<<< bridge.4 .It Dv SIOCBRDGARL .Pq Li "struct ifbrlreq" Add a Ethernet address filtering rule to the bridge on a specific |