summaryrefslogtreecommitdiff
path: root/sys/arch/pc532/include
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-11-10 00:10:18 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-11-10 00:10:18 +0000
commite69c1559c546742682c460d3aa1dc4c59157acff (patch)
tree76e357af2ed93b5f0517fe4b72e64c65c19f0387 /sys/arch/pc532/include
parentbe0a7e32d4fdd6e1b72857ad15691c7f0b223946 (diff)
DOH! conflicts from me
Diffstat (limited to 'sys/arch/pc532/include')
-rw-r--r--sys/arch/pc532/include/endian.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/arch/pc532/include/endian.h b/sys/arch/pc532/include/endian.h
index 014e749daaf..b4909155ed0 100644
--- a/sys/arch/pc532/include/endian.h
+++ b/sys/arch/pc532/include/endian.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: endian.h,v 1.4 1997/11/09 23:05:12 niklas Exp $ */
+/* $OpenBSD: endian.h,v 1.5 1997/11/10 00:10:17 niklas Exp $ */
/*-
* Copyright (c) 1997 Niklas Hallqvist. All rights reserved.