Skip to content
Snippets Groups Projects
Commit 6e2aca64 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

fix merge

parent 42e300e3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
Makefile
+ 2
− 2
View file @ 6e2aca64
......@@ -152,8 +152,8 @@ SUBDIR+= rviz-plugin-covariance
SUBDIR+= simple-grasping-action
SUBDIR+= sot-core-v3
SUBDIR+= sot-dynamic-pinocchio-v3
SUBDIR+= sot-dyninv
SUBDIR+= sot-dyninv-v3
#SUBDIR+= sot-dyninv
#SUBDIR+= sot-dyninv-v3
SUBDIR+= soth
SUBDIR+= sot-hrp2
SUBDIR+= sot-hrp2-v3
......
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