@@ -13,17 +13,11 @@ students to hands-on robotics engineering.
1313
1414## What We Do
1515
16- <<<<<<< Updated upstream
17-
1816### [ MATE Underwater Robotics] ( projects/mate )
1917
2018The Mate project enables students to work on Marine Robotics. This project
2119participates in the MATE ROV International Competition.
2220
23- ### [ Cruz Control Autonomous Vehicles] ( projects/cruzcontrol )
24-
25- cruzcontrolcruzcontrolcruzcontrol
26-
2721### [ SOMARS UAV Research] ( projects/somars )
2822
2923The SOMARS (System for the Oversight and Management of Autonomous Robotics
@@ -51,10 +45,6 @@ blue water bottle,” and even stream on Twitch to respond to chat. Our goal is
5145collaborate with professors and students—especially in chemistry and biomedical
5246fields—to explore real lab automation and new applications.
5347
54- ### [ Business Operations] ( projects/business )
55-
56- businessbusinessbusiness
57-
5848### [ Combat Robotics] ( projects/combatrobotics )
5949
6050The Combat Robotics Team at UCSC creates a safe and engaging space for engineers
@@ -63,14 +53,6 @@ new members work in groups to make 1lb plastic combat robots that compete
6353against each other. Additionally, our team has 2 beetleweight combat robots that
6454compete around California.
6555
66- ### [ Cruz Control Autonomous Vehicles] ( projects/cruzcontrol )
67-
68- cruzcontrolcruzcontrolcruzcontrol
69-
70- ### [ Rover Team] ( projects/rover )
71-
72- roverroverrover
73-
7456### [ Humanoid Team] ( projects/humanoid )
7557
7658The Humanoid Robot sub team is dedicated to designing and building an in-house
0 commit comments