Merge branch 'operator_260312' into auto-trying

author WesleyWong-972 <wesleycwong@gmail.com>

Fri, 13 Mar 2026 04:43:08 +0000 (21:43 -0700)

committer WesleyWong-972 <wesleycwong@gmail.com>

Fri, 13 Mar 2026 04:43:08 +0000 (21:43 -0700)
author WesleyWong-972 <wesleycwong@gmail.com>
Fri, 13 Mar 2026 04:43:08 +0000 (21:43 -0700)
committer WesleyWong-972 <wesleycwong@gmail.com>
Fri, 13 Mar 2026 04:43:08 +0000 (21:43 -0700)
diff --cc src/main/java/frc/robot/commands/gpm/Superstructure.java
Simple merge
diff --cc src/main/java/frc/robot/subsystems/shooter/Shooter.java
Simple merge
author	WesleyWong-972 <wesleycwong@gmail.com>
	Fri, 13 Mar 2026 04:43:08 +0000 (21:43 -0700)
committer	WesleyWong-972 <wesleycwong@gmail.com>
	Fri, 13 Mar 2026 04:43:08 +0000 (21:43 -0700)
		1	2
src/main/java/frc/robot/commands/gpm/Superstructure.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/frc/robot/subsystems/shooter/Shooter.java	patch \|	diff1 \|	diff2 \|	blob \| history