From: Sebastian Hammer <quinn@indexdata.com>
Date: Thu, 16 Feb 1995 18:35:43 +0000 (+0000)
Subject: Changing order.
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=354551f6bf617eb9c44c341574c60e0ff5b4fd3b;p=egate.git

Changing order.
---

diff --git a/Makefile b/Makefile
index 20b06fa..12126bc 100644
--- 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