Skip to content
Snippets Groups Projects
Commit 6502b4d9 authored by Carlos Mastalli's avatar Carlos Mastalli
Browse files

Merge branch 'topic/quadrotors' of github.com:cmastalli/example-robot-data into topic/quadrotors

parents 5cc2ba44 59b928fb
No related branches found
No related tags found
No related merge requests found
Pipeline #35408 passed
...@@ -114,4 +114,4 @@ ...@@ -114,4 +114,4 @@
<axis xyz="0 0 -1" /> <axis xyz="0 0 -1" />
<limit lower="0" upper="0" effort="0" velocity="0" /> <limit lower="0" upper="0" effort="0" velocity="0" />
</joint> </joint>
</robot> </robot>
\ No newline at end of file
...@@ -224,4 +224,4 @@ ...@@ -224,4 +224,4 @@
<child link="flying_arm_5__gripper"/> <child link="flying_arm_5__gripper"/>
<axis xyz="0 0 1"/> <axis xyz="0 0 1"/>
</joint> </joint>
</robot> </robot>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment