Skip to content

Commit dae2f7f

Browse files
Removed empty pages
1 parent 08e0f22 commit dae2f7f

6 files changed

Lines changed: 10 additions & 94 deletions

File tree

docs/about.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ hide:
55

66
# About
77

8-
UCSC Slugbotics is a hands on robotics team where students of all majors can take
9-
a step into real world engineering, creativity, and teamwork. Members design and
10-
build competitive robots that compete in national competitions, gaining valuable
11-
skills in mechanical, electrical, and software engineering. No prior experience
12-
is required, and students of all majors are welcomed. We strive to foster an
13-
inclusive and friendly environment for members new and old to get involved in the
14-
world of engineering. Whether you have a project you'd like to start or want to
15-
join a preexisting project team, Slugbotics looks forward to meeting you.
8+
UCSC Slugbotics is a hands on robotics team where students of all majors can
9+
take a step into real world engineering, creativity, and teamwork. Members
10+
design and build competitive robots that compete in national competitions,
11+
gaining valuable skills in mechanical, electrical, and software engineering. No
12+
prior experience is required, and students of all majors are welcomed. We strive
13+
to foster an inclusive and friendly environment for members new and old to get
14+
involved in the world of engineering. Whether you have a project you'd like to
15+
start or want to join a preexisting project team, Slugbotics looks forward to
16+
meeting you.

docs/index.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -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

2018
The Mate project enables students to work on Marine Robotics. This project
2119
participates 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

2923
The 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
5145
collaborate with professors and students—especially in chemistry and biomedical
5246
fields—to explore real lab automation and new applications.
5347

54-
### [Business Operations](projects/business)
55-
56-
businessbusinessbusiness
57-
5848
### [Combat Robotics](projects/combatrobotics)
5949

6050
The 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
6353
against each other. Additionally, our team has 2 beetleweight combat robots that
6454
compete 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

7658
The Humanoid Robot sub team is dedicated to designing and building an in-house

docs/onboarding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ You're in the right place! A good fist step is joining our
1212
subteams and get to know other members. From there, to start attending meetings
1313
you'll need to complete the BE49 Club Hub module on the
1414
[Slugworks Canvas](https://canvas.ucsc.edu/courses/77701) (this gets refreshed
15-
every year,so don't start it during the summer!). After that, you're off to the
15+
every year, so don't start it during the summer!). After that, you're off to the
1616
races! Watch out on Discord for meeting announcements, or just come hang out
1717
around the lab and see what people are working on!

docs/projects/business.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/projects/cruzcontrol.md

Lines changed: 0 additions & 65 deletions
This file was deleted.

docs/projects/rover.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)