Skip to content

Commit

Permalink
Fix README merge issues (#63)
Browse files Browse the repository at this point in the history
# Description

Fixed any merge issues with the README

## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)

# How Has This Been Tested?
N/A

# Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation, if any
- [x] My changes generate no new warnings
- [x] I have performed tests that prove my fix is effective or that my
feature works, if necessary
- [x] New and existing unit tests pass locally with my changes
  • Loading branch information
Ian Tapply authored Jan 7, 2024
1 parent bbe7858 commit c4e1f64
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
[![Build](https://github.com/Simbotics/Simbot-Base/actions/workflows/build.yml/badge.svg)](https://github.com/Simbotics/Simbot-Base/actions/workflows/build.yml)

# Simbot-Base
A base robot with the most up-to-date utilities and starting components to get started on robot code as fast as possible
# DISCLAIMER
All code at this point in time is a WIP and has NOT been tested or run on any robot and we can NOT confirm that the code will work as it is intended.

# Simbot Base
A base robot with the most up-to-date utilities and starting components to get started on robot code as fast as possible.

## Contributing
Interested in contributing to the project? Be sure to read [the contributing information](https://github.com/Simbotics/Simbot-Base/blob/main/CONTRIBUTING.md) for more information on how to get started with contributing to the codebase.

## Contributors and Credits
Thank you to the following who has contributed, supplied the tools to make this project even possible, or has supported this project along the way.

- [CTR Electronics](https://github.com/CrossTheRoadElec) - Provided an example and starter [repository](https://github.com/CrossTheRoadElec/Phoenix6-Examples/tree/main/java/SwerveWithPathPlanner) to build from
- [Ian Tapply](https://github.com/IanTapply22) - Main student contributor
- [Kaleb Dodd](https://github.com/kaleb-dodd) - Project coordinator
- [Cole MacPhail](https://github.com/colemacphail) - Project coordinator
- [Ian Tapply](https://github.com/IanTapply22) - Main student contributor
- [Hoodie Rocks/Cobblestone](https://github.com/HoodieRocks) - Student programmer

0 comments on commit c4e1f64

Please sign in to comment.