resolving merge conflicts

d609ba24 · thomwolf · 64ce9009 · d609ba24 · 64ce9009
Commit d609ba24 authored Feb 05, 2019 by thomwolf
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 159 additions and 1145 deletions

examples/run_squad.py examples/run_squad.py +159 -74

examples/run_squad2.py examples/run_squad2.py +0 -1071

No files found.
--- a/examples/run_squad.py
+++ b/examples/run_squad.py
--- a/examples/run_squad2.py
+++ b/examples/run_squad2.py