Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 99 additions and 63 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment