-
Andrea Del Prete authored
Conflicts: bindings/python/contacts/contact-6d.hpp exercizes/ex_1.py exercizes/ex_2.py unittest/tsid-formulation.cpp
f21c6fa9
Conflicts: bindings/python/contacts/contact-6d.hpp exercizes/ex_1.py exercizes/ex_2.py unittest/tsid-formulation.cpp