From 9786fe0a6a270d0ce16ac4c4e6068d48ff042aad Mon Sep 17 00:00:00 2001
From: kuepper <kuepper>
Date: Tue, 28 Sep 2004 17:13:34 +0000
Subject: [PATCH] Fix cvs-commit error (<<< still there...)

---
 eo/src/do/make_algo_scalar.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eo/src/do/make_algo_scalar.h b/eo/src/do/make_algo_scalar.h
index ee7540c2..7dfebe3a 100644
--- a/eo/src/do/make_algo_scalar.h
+++ b/eo/src/do/make_algo_scalar.h
@@ -39,11 +39,8 @@
 #include <eoFitnessScalingSelect.h>
 #include <eoRankingSelect.h>
 #include <eoStochTournamentSelect.h>
-<<<<<<< make_algo_scalar.h
-#include <utils/eoDistance.h>
-=======
 #include <eoSharingSelect.h>
->>>>>>> 1.13
+#include <utils/eoDistance.h>
 
 // Breeders
 #include <eoGeneralBreeder.h>