diff options
| author | obrien <obrien@FreeBSD.org> | 1999-06-22 19:19:46 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-06-22 19:19:46 +0000 |
| commit | 28ec06e8776d943f63fb715f1268b46e38d81c0a (patch) | |
| tree | be18c596ac450e1cd0ce4ab661ba0f4d356e6a0c /sys/dev/xe/if_xereg.h | |
| parent | 8b6052a98b3651b94f9a6a96d2bece9e0734c6a5 (diff) | |
| download | FreeBSD-src-28ec06e8776d943f63fb715f1268b46e38d81c0a.zip FreeBSD-src-28ec06e8776d943f63fb715f1268b46e38d81c0a.tar.gz | |
Fix conflicts.
Diffstat (limited to 'sys/dev/xe/if_xereg.h')
| -rw-r--r-- | sys/dev/xe/if_xereg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h index 060db2ca..a4ecb35 100644 --- a/sys/dev/xe/if_xereg.h +++ b/sys/dev/xe/if_xereg.h @@ -24,6 +24,7 @@ * SUCH DAMAGE. * * $Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $ + * $FreeBSD$ */ /* |
