resolving merge conflicts (70979a50) · Commits · pranjal_dhole / Flatland · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Flatland
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

70979a50

Commit 70979a50 authored 5 years ago by Erik Nygren

:bullettrain_front:

Downloads
- Plain Diff

resolving merge conflicts

parents df8a43c3 a3b5871f

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

examples/flatland_2_0_example.py 17 additions, 9 deletions

examples/flatland_2_0_example.py
flatland/envs/rail_env.py 37 additions, 3 deletions

flatland/envs/rail_env.py
flatland/utils/graphics_pil.py 18 additions, 5 deletions

flatland/utils/graphics_pil.py
flatland/utils/rendertools.py 51 additions, 44 deletions

flatland/utils/rendertools.py

with 123 additions and 61 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment