Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- src/Makefile	2003/04/04 01:06:00	1.202
+++ src/Makefile	2003/04/04 01:16:28	1.203
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.202 2003/04/04 01:06:00 thorpej Exp $
+#	$NetBSD: Makefile,v 1.203 2003/04/04 01:16:28 thorpej Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -291,11 +291,7 @@ do-${targ}: ${targ}
 	@true
 .endfor
 
-<<<<<<< Makefile
-.for dir in tools tools/compat lib/csu lib/libc lib gnu/lib
-=======
-.for dir in tools lib/csu lib/libc lib/libcrypt lib gnu/lib
->>>>>>> 1.201
+.for dir in tools tools/compat lib/csu lib/libc lib/libcrypt lib gnu/lib
 do-${dir:S/\//-/}:
 .for targ in dependall install
 	(cd ${.CURDIR}/${dir} && ${MAKE} ${targ})