From f4c30d5dd46e936dae7a83bd68992d1a563ba39f Mon Sep 17 00:00:00 2001
From: aarav18 <aaravshah18@gmail.com>
Date: Sat, 22 Jan 2022 13:58:11 -0700
Subject: [PATCH] Create SparkTester.java.bak

---
 .../robot/subsystems/SparkTester.java.bak     | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/main/java/frc4388/robot/subsystems/SparkTester.java.bak

diff --git a/src/main/java/frc4388/robot/subsystems/SparkTester.java.bak b/src/main/java/frc4388/robot/subsystems/SparkTester.java.bak
new file mode 100644
index 0000000..ea6af53
--- /dev/null
+++ b/src/main/java/frc4388/robot/subsystems/SparkTester.java.bak
@@ -0,0 +1,40 @@
+// 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
+  }
+}