get rid of merge error markers

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index ac4e2fac8ad27ec6dac8e78dc41c567ba3d58275..2a26c73e0e459314f46ed5770ad2ad6a0f66fe5c 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -26,18 +26,16 @@ public class Robot extends IterativeRobot {
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
-  positionFourDefense, positionFiveDefense;
+      positionFourDefense, positionFiveDefense;
 
   // Gyro stuff
   public GyroLib gyro;
->>>>>>> Remove useless variables and commented stuff in Robot.java
 
   @Override
   public void robotInit() {
     driveTrain = new DriveTrain();
     oi = new OI();
     gyro = new GyroLib(I2C.Port.kOnboard, false);
->>>>>>> Remove useless variables and commented stuff in Robot.java
 
     shooter = new Shooter();
     scaler = new Scaler();
@@ -48,9 +46,6 @@ public class Robot extends IterativeRobot {
     addPositionChooserOptions();
     addDefensesToAllDefenseSendableChoosers();
     sendSendableChoosersToSmartDashboard();
-
-=======
->>>>>>> Remove useless variables and commented stuff in Robot.java
   }
 
   private void initializeSendableChoosers() {