diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-11-09 23:51:30 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-11-09 23:51:30 +0000 |
commit | 11ce431f4994734183b87923f22286df47b522cc (patch) | |
tree | ce89db43ea43dd4930fc5a0c413fae2878fa83e8 | |
parent | 96e61afbe4a12ac4fa7d6dec71c05a56587f966b (diff) |
Whoops a conflict crept in
-rw-r--r-- | sys/arch/i386/include/endian.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/arch/i386/include/endian.h b/sys/arch/i386/include/endian.h index 3c671f6cf96..52e65f5aac3 100644 --- a/sys/arch/i386/include/endian.h +++ b/sys/arch/i386/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.7 1997/11/09 23:05:06 niklas Exp $ */ +/* $OpenBSD: endian.h,v 1.8 1997/11/09 23:51:29 niklas Exp $ */ /*- * Copyright (c) 1997 Niklas Hallqvist. All rights reserved. |