From 11ce431f4994734183b87923f22286df47b522cc Mon Sep 17 00:00:00 2001
From: Niklas Hallqvist <niklas@cvs.openbsd.org>
Date: Sun, 9 Nov 1997 23:51:30 +0000
Subject: Whoops a conflict crept in

---
 sys/arch/i386/include/endian.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys/arch/i386/include/endian.h')

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.
-- 
cgit v1.2.3