updated gradlerio version

build.gradle

@@ -2,7 +2,7 @@ import edu.wpi.first.gradlerio.deploy.roborio.RoboRIO
 
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2022.1.1"
+    id "edu.wpi.first.GradleRIO" version "2022.2.1"
 }
 
 sourceCompatibility = JavaVersion.VERSION_11

src/main/java/frc4388/robot/subsystems/SparkTester.java.bak

@@ -1,40 +0,0 @@
-// Copyright (c) FIRST and other WPILib contributors.
-// Open Source Software; you can modify and/or share it under the terms of
-// the WPILib BSD license file in the root directory of this project.
-
-package frc4388.robot.subsystems;
-
-<<<<<<< HEAD
-import edu.wpi.first.wpilibj2.command.SubsystemBase;
-
-public class SparkTester extends SubsystemBase {
-  /** Creates a new SparkTester. */
-  public SparkTester(CANSparkMax m_sparkMaxMotor) {}
-
-  public void setMotorSpeed(double speed) {
-    speed = Double.max(Double.min(speed, 1.d), -1.d);
-    m_sparkTestMotor.set(speed);
-=======
-import com.revrobotics.CANSparkMax;
-
-import edu.wpi.first.wpilibj2.command.SubsystemBase;
-
-public class SparkTester extends SubsystemBase {
-  CANSparkMax m_sparkMaxTestMotor;
-  
-  /** Creates a new SparkTester. */
-  public SparkTester(CANSparkMax m_sparkMaxTestMotor) {
-    m_sparkMaxTestMotor = sparkMaxTestMotor;
-  }
-
-  public void setMotorSpeed(double speed) {
-    speed = Double.max(Double.min(speed, 1.d), -1.d);
-    m_sparkMaxTestMotor.set(speed);
->>>>>>> ff1467d7e4b94be8df11b36e09f3331b2e25bd53
-  }
-
-  @Override
-  public void periodic() {
-    // This method will be called once per scheduler run
-  }
-}