From a6ded8d93b8bf0ef9b1b554a2d8a4c05e7d479be Mon Sep 17 00:00:00 2001
From: hachti <hachti>
Date: Thu, 14 Dec 2006 05:59:46 +0000
Subject: [PATCH] *** empty log message ***

---
 Makefile | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Makefile b/Makefile
index f9a129a..d723946 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 # Toplevel Makefile for Hachti's H316 stuff collection
 
-<<<<<<< Makefile
 # First we need the PC side tools. Nothing runs without them!
 SUBDIRS=pc-tools/ldc pc-tools/src-filters  pc-tools/boot-maker 
 
@@ -25,12 +24,6 @@ SUBDIRS+=programs/mandelbrot\
         programs/punchomat\
 
 
-=======
-SUBDIRS=pc-tools/ldc pc-tools/src-filters  pc-tools/boot-maker lib/iolib lib/fortran \
-        lib/fortran  lib/iolib programs/mandelbrot\
-        programs/punchomat programs/tools systems
->>>>>>> 1.12
-
 #lib/fortran/vpunch-help
 
 # If you want to build the docs, too: Uncomment next line:
-- 
2.32.0