Changing order.

diff --git a/Makefile b/Makefile
index 20b06fa..12126bc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,10 @@
 # Europagate, 1994-1995.
 #
 # $Log: Makefile,v $
-# Revision 1.8  1995/02/16 18:34:06  adam
+# Revision 1.9  1995/02/16 18:35:43  quinn
+# Changing order.
+#
+# Revision 1.8  1995/02/16  18:34:06  adam
 # Minor changes.
 #
 # Revision 1.7  1995/02/16  15:01:26  quinn
@@ -28,7 +31,13 @@
 #
 SHELL=/bin/sh
 MAKE=make
+<<<<<<< Makefile
+SUBDIR=res+log util fml ccl zlayer kernel
+||||||| 1.8
+SUBDIR=res+log util fml ccl kernel zlayer
+=======
 SUBDIR=res+log util fml ccl zlayer kernel 
+>>>>>>> /tmp/T4a24364
 CFLAGS=-Wall -g -pedantic -ansi 
 #CC=gcc