nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix cvs-commit error (<<< still there...)

Browse source
This commit is contained in:
kuepper 2004-09-28 17:13:34 +00:00
commit 9786fe0a6a
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
eo/src/do/make_algo_scalar.h
View file

@ -39,11 +39,8 @@
#include <eoFitnessScalingSelect.h> #include <eoFitnessScalingSelect.h>
#include <eoRankingSelect.h> #include <eoRankingSelect.h>
#include <eoStochTournamentSelect.h> #include <eoStochTournamentSelect.h>
<<<<<<< make_algo_scalar.h
#include <utils/eoDistance.h>
=======
#include <eoSharingSelect.h> #include <eoSharingSelect.h>
>>>>>>> 1.13 #include <utils/eoDistance.h>
// Breeders // Breeders
#include <eoGeneralBreeder.h> #include <eoGeneralBreeder.h>