make it build

whoops, merging is hard
This commit is contained in:
Elijah Price
2020-02-13 18:03:17 -07:00
committed by GitHub
parent a8306807fe
commit ea05f9d1b2
@@ -493,7 +493,7 @@ public class Drive extends SubsystemBase {
public void selectSong(String song) {
SmartDashboard.putString("Selected Song", song);
m_orchestra.loadMusic(song);
}
/**
* Set to high or low gear based on boolean state, true = high, false = low
* @param state Chooses between high or low gear