From e69c1559c546742682c460d3aa1dc4c59157acff Mon Sep 17 00:00:00 2001
From: Niklas Hallqvist <niklas@cvs.openbsd.org>
Date: Mon, 10 Nov 1997 00:10:18 +0000
Subject: DOH! conflicts from me

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

(limited to 'sys/arch/arc/include')

diff --git a/sys/arch/arc/include/endian.h b/sys/arch/arc/include/endian.h
index 771c96526ff..63b9751e035 100644
--- a/sys/arch/arc/include/endian.h
+++ b/sys/arch/arc/include/endian.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endian.h,v 1.6 1997/11/09 23:05:03 niklas Exp $	*/
+/*	$OpenBSD: endian.h,v 1.7 1997/11/10 00:10:13 niklas Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
-- 
cgit v1.2.3