From 0819460cf5121717f88584b2245de4e911ecb9b0 Mon Sep 17 00:00:00 2001
From: liefooga <liefooga@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 26 Jun 2007 13:34:24 +0000
Subject: [PATCH] merge ParadisEO-MOEO v-1.0

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@403 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-moeo/src/do/make_ea_moeo.h | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/trunk/paradiseo-moeo/src/do/make_ea_moeo.h b/trunk/paradiseo-moeo/src/do/make_ea_moeo.h
index e9f8ef7ae..bd624cc17 100755
--- a/trunk/paradiseo-moeo/src/do/make_ea_moeo.h
+++ b/trunk/paradiseo-moeo/src/do/make_ea_moeo.h
@@ -20,25 +20,6 @@
 #include <eoGenOp.h>
 #include <utils/eoParser.h>
 #include <utils/eoState.h>
-<<<<<<< .courant
-#include <moeoArchive.h>
-#include <moeoComparator.h>
-#include <moeoCrowdingDistanceDiversityAssignment.h>
-#include <moeoDetTournamentSelect.h>
-#include <moeoDiversityAssignment.h>
-#include <moeoEA.h>
-#include <moeoEasyEA.h>
-#include <moeoElitistReplacement.h>
-#include <moeoEnvironmentalReplacement.h>
-#include <moeoFastNonDominatedSortingFitnessAssignment.h>
-#include <moeoFitnessAssignment.h>
-#include <moeoGenerationalReplacement.h>
-#include <moeoIndicatorBasedFitnessAssignment.h>
-#include <moeoRandomSelect.h>
-#include <moeoReplacement.h>
-#include <moeoSelectOne.h>
-#include <moeoStochTournamentSelect.h>
-=======
 
 #include <algo/moeoEA.h>
 #include <algo/moeoEasyEA.h>
@@ -57,7 +38,6 @@
 #include <fitness/moeoIndicatorBasedFitnessAssignment.h>
 #include <metric/moeoAdditiveEpsilonBinaryMetric.h>
 #include <metric/moeoHypervolumeBinaryMetric.h>
->>>>>>> .fusion-droit.r399
 #include <metric/moeoNormalizedSolutionVsSolutionBinaryMetric.h>
 #include <replacement/moeoElitistReplacement.h>
 #include <replacement/moeoEnvironmentalReplacement.h>