From 799202c5127540c3ef957c987f5937af4cb838c0 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Sun, 5 Aug 2001 03:37:37 +0000
Subject: [PATCH] Fix botched commit (a conflict was committed).

---
 etc/Makefile | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index 0d9bed4e6ed7..bbdbfc397e08 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.177 2001/08/04 18:41:18 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.178 2001/08/05 03:37:37 matt Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -116,22 +116,6 @@ PCS=	pcs750.bin
 
 # find out endianness of target and set proper flag for pwd_mkdb so that
 # it creates database in same endianness
-<<<<<<< Makefile
-.if	(${MACHINE_ARCH} == "alpha")   || \
-	(${MACHINE_ARCH} == "arm26")   || \
-	(${MACHINE_ARCH} == "arm32")   || \
-	(${MACHINE_ARCH} == "i386")    || \
-	(${MACHINE_ARCH} == "mipsel")  || \
-	(${MACHINE_ARCH} == "ns32k")   || \
-	(${MACHINE_ARCH} == "vax") 
-TARGET_ENDIANNESS?= -L
-.elif	(${MACHINE_ARCH} == "m68k")    || \
-	(${MACHINE_ARCH} == "mipseb")  || \
-	(${MACHINE_ARCH} == "powerpc") || \
-	(${MACHINE_ARCH} == "sparc")   || \
-	(${MACHINE_ARCH} == "sparc64")
-TARGET_ENDIANNESS?= -B
-=======
 .if exists(${DESTDIR}/usr/include/machine/endian_machdep.h)
 TARGET_ENDIANNESS!= \
 	( echo "\#include <machine/endian_machdep.h>" ; echo _BYTE_ORDER ) | \
@@ -144,7 +128,6 @@ TARGET_ENDIANNESS=
 TARGET_ENDIANNESS= -L
 .elif ${TARGET_ENDIANNESS} == "_BIG_ENDIAN"
 TARGET_ENDIANNESS= -B
->>>>>>> 1.176
 .else
 # XXX sh3 should be split into sh3eb and sh3el
 TARGET_ENDIANNESS=