fix of merge conflict
Showing
- __pycache__/RotTable.cpython-37.pyc 0 additions, 0 deletions__pycache__/RotTable.cpython-37.pyc
- __pycache__/Traj3D.cpython-37.pyc 0 additions, 0 deletions__pycache__/Traj3D.cpython-37.pyc
- __pycache__/individu.cpython-37.pyc 0 additions, 0 deletions__pycache__/individu.cpython-37.pyc
- algogenetique.py 2 additions, 2 deletionsalgogenetique.py
- individu.py 28 additions, 6 deletionsindividu.py
- population.py 3 additions, 3 deletionspopulation.py
Loading
Please register or sign in to comment