Merge to main for Scrimmage

Update README.md
Merge pull request 'WIP - Test Merge ( dev to main )' (#1 ) from dev into main
2025-10-09 12:01:36 -05:00 · 2025-09-10 13:28:54 +00:00 · 2025-09-02 02:32:19 +00:00
1 changed files with 9 additions and 1 deletions
--- a/README.md
+++ b/README.md
@@ -14,7 +14,11 @@ This repository contains the Pybricks code for Team 65266 Lego Dynamics' robot f

 ## Code Structure

+<<<<<<< HEAD
+Files are the different runs we do, with each run consisting of one or multiple mission completions. Another script combines these files into a "master" file, which then adds the color sensor to start logic.
+=======
 Files are the different runs we do, with each run consisting of one or multiple mission completions. Another script combines these files into a "master" file, which then adds the color-sensor-to-start logic.
+>>>>>>> dev

 ## How to Use

@@ -22,7 +26,11 @@ Load the master file into PyBricks, then send it over to the robot. Then you hol

 ## License
 GNU General Public License
+<<<<<<< HEAD
+You can take inspiration from our code, but you can't take our exact code.
+=======

 You can take inspiration from our code, but you can't take our exact code.

-Read LICENSE for more information.
+Read LICENSE for more information.
+>>>>>>> dev
Author	SHA1	Message	Date
nifrali	3fdd6ae9d1	Merge to main for Scrimmage	2025-10-09 12:01:36 -05:00
Atharv	ee0b8eb6a0	Update README.md	2025-09-10 13:28:54 +00:00
nifrali	a745ed8c79	Merge pull request 'WIP - Test Merge ( dev to main )' (#1 ) from dev into main Reviewed-on: #1	2025-09-02 02:32:19 +00:00