tree 8fc5796364aa297a60eea61a3edd613887fdb2a8
parent 3d0bbf9c5b23413b0442a1a593857fc6762ac711
author James Kuszmaul <jabukuszmaul+collab@gmail.com> 1583425484 -0800
committer James Kuszmaul <jabukuszmaul+collab@gmail.com> 1583425514 -0800

Resolve logical merge conflict in superstructure test

Merging the aiming code caused some merge conflicts due to turret
tuning.

Change-Id: Id1ff22fdfdfe4efc0ed7590a678b36f3438cb0f2