From 76e78116ac0d20ff4152e7bb4fd3a468074af0eb Mon Sep 17 00:00:00 2001
From: evomarc <evomarc>
Date: Mon, 27 Sep 2004 15:19:53 +0000
Subject: [PATCH] Added include eoDistance.h

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

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