From 3a95cbc235def43b7b1742d3fefdb161156caece Mon Sep 17 00:00:00 2001
From: Joe Muraski <jmuraski@shipt.com>
Date: Tue, 8 Oct 2024 21:05:56 -0500
Subject: [PATCH] fixed merge error

---
 .../java/org/firstinspires/ftc/teamcode/DriveOnlyOpMode.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveOnlyOpMode.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveOnlyOpMode.java
index b5f43eb..bbe77da 100644
--- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveOnlyOpMode.java
+++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DriveOnlyOpMode.java
@@ -54,7 +54,7 @@ public class DriveOnlyOpMode extends LinearOpMode {
 
     // Declare OpMode members.
     private ElapsedTime runtime = new ElapsedTime();
-    DriveSubsystem driveSubsystem = new DriveSubsystem();
+    DriveSubsystem driveSubsystem;
     SlideSubsystem slideSubsystem;
     ArmSubsystem arm;
     WristSubsystem wrist;