Commit 7ba0f38c authored by nilabha's avatar nilabha
Browse files

Merge branch 'flatland-3-updates' into 'flatland3-pettingzoo'

# Conflicts:
#   flatland/contrib/interface/flatland_env.py
#   flatland/contrib/requirements_training.txt
#   tests/test_pettingzoo_interface.py
parents 62e02366 a578d2a1
Pipeline #8492 failed with stages
in 6 minutes and 25 seconds