comments

beimingli0626 · Jul 28, 2023 · 87e51b5 · 87e51b5
2 parents c35d3ca + f735f7b
commit 87e51b5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
@@ -2,11 +2,15 @@
 
 # Install MARLlib as editable python package
 cd /workspaces/MARLlib && pip install -e .
+<<<<<<< HEAD
 
 # Install specific protobuf version to fix ray 1.8 protobuf bug
 # TODO - remove when upgrading dependencies
 # BUG - tensorboardx probably not working as expected due to this temporary fix
 pip install protobuf==3.20
 
 # Install dependencies for test suite
+=======
+pip install protobuf==3.20
+>>>>>>> f735f7bc0bc075fc4eff65f21f0159114ae466ba
 pip install pytest pytest-cov