diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-02-27 22:56:15 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-02-27 22:56:15 +0000 |
| commit | 9c887536f8cfd044f18e84edfd0e304ee709ddb3 (patch) | |
| tree | b6c0d055a9e6b58119eb3c3b12c863c9e58af757 | |
| parent | a1317c2b742e563917acb61906ae18be43b08bcc (diff) | |
Remove CVS conflicts that got in by mistake in my last checkin
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index d60d319783d..69236048330 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_vnops.c,v 1.2 1996/02/27 07:21:33 niklas Exp $ */ +/* $OpenBSD: ufs_vnops.c,v 1.3 1996/02/27 22:56:14 niklas Exp $ */ /* $NetBSD: ufs_vnops.c,v 1.17 1996/02/11 02:06:13 christos Exp $ */ /* |