Fixed more github upstream stuff

why v2
2020-10-04 14:38:41 -04:00
parent 4b375659bb
commit 89df506469
3 changed files with 1 additions and 18 deletions
--- a/src/initialization/population_structure/population.py
+++ b/src/initialization/population_structure/population.py
@ -21,12 +21,8 @@ class Population:
        del self.chromosomes[index]

    def get_all_chromosomes(self):
-<<<<<<< Updated upstream
-        return chromosomes
-=======
        """returns all chromosomes in the population"""
        return self.chromosomes
->>>>>>> Stashed changes

    def get_fitness(self):
        return self.fitness