Updated to Template

Team4065 · Mar 6, 2021 · ee6d02e · ee6d02e
1 parent 2774ae9
commit ee6d02e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -58,11 +58,6 @@ private void configureButtonBindings() {
    * @return the command to run in autonomous
    */
   public Command getAutonomousCommand() {
-<<<<<<< HEAD
-    //An ExampleCommand will run in autonomous
-    return m_shoot;
-=======
     return new ExampleCommand();
->>>>>>> template/master
   }
 }