X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=Makefile;h=384ffb7fa6dcee31d2b09f62762e02320e987911;hb=0adb9322527cc80bb8c70b43d604a3145ad645fc;hp=12126bc08972021cb05ceabb742d93b1207dd432;hpb=354551f6bf617eb9c44c341574c60e0ff5b4fd3b;p=egate.git

diff --git a/Makefile b/Makefile
index 12126bc..384ffb7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,10 @@
 # Europagate, 1994-1995.
 #
 # $Log: Makefile,v $
-# Revision 1.9  1995/02/16 18:35:43  quinn
+# Revision 1.10  1995/02/16 18:36:18  quinn
+# Changed order yet again
+#
+# Revision 1.9  1995/02/16  18:35:43  quinn
 # Changing order.
 #
 # Revision 1.8  1995/02/16  18:34:06  adam
@@ -31,13 +34,7 @@
 #
 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