Merge branch 'main' into phoenix-pro

author iefomit <timofei.stem@gmail.com>

Tue, 7 Apr 2026 01:50:09 +0000 (18:50 -0700)

committer iefomit <timofei.stem@gmail.com>

Tue, 7 Apr 2026 01:50:09 +0000 (18:50 -0700)
author iefomit <timofei.stem@gmail.com>
Tue, 7 Apr 2026 01:50:09 +0000 (18:50 -0700)
committer iefomit <timofei.stem@gmail.com>
Tue, 7 Apr 2026 01:50:09 +0000 (18:50 -0700)
diff --cc src/main/java/frc/robot/subsystems/spindexer/Spindexer.java
Simple merge
diff --cc src/main/java/frc/robot/subsystems/turret/Turret.java
Simple merge
author	iefomit <timofei.stem@gmail.com>
	Tue, 7 Apr 2026 01:50:09 +0000 (18:50 -0700)
committer	iefomit <timofei.stem@gmail.com>
	Tue, 7 Apr 2026 01:50:09 +0000 (18:50 -0700)
		1	2
src/main/java/frc/robot/subsystems/spindexer/Spindexer.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/frc/robot/subsystems/turret/Turret.java	patch \|	diff1 \|	diff2 \|	blob \| history