Merge branch 'main' into locked-shoot

author Timofei <108955303+iefomit@users.noreply.github.com>

Mon, 6 Apr 2026 19:46:39 +0000 (12:46 -0700)

committer GitHub <noreply@github.com>

Mon, 6 Apr 2026 19:46:39 +0000 (12:46 -0700)
author Timofei <108955303+iefomit@users.noreply.github.com>
Mon, 6 Apr 2026 19:46:39 +0000 (12:46 -0700)
committer GitHub <noreply@github.com>
Mon, 6 Apr 2026 19:46:39 +0000 (12:46 -0700)
diff --cc src/main/java/frc/robot/RobotContainer.java
Simple merge
diff --cc src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java
Simple merge
author	Timofei <108955303+iefomit@users.noreply.github.com>
	Mon, 6 Apr 2026 19:46:39 +0000 (12:46 -0700)
committer	GitHub <noreply@github.com>
	Mon, 6 Apr 2026 19:46:39 +0000 (12:46 -0700)
		1	2
src/main/java/frc/robot/RobotContainer.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java	patch \|	diff1 \|	diff2 \|	blob \| history