From 0adb9322527cc80bb8c70b43d604a3145ad645fc Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Thu, 16 Feb 1995 18:36:18 +0000
Subject: [PATCH] Changed order yet again

---
 Makefile |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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
 
-- 
1.7.10.4