From 0c921a389709cd0493448ac98d7a38ca379625f0 Mon Sep 17 00:00:00 2001
From: Casey Wittrock <caseywittrockmn@gmail.com>
Date: Tue, 28 Oct 2025 00:33:51 -0500
Subject: [PATCH] test commit

---
 frontend/src/utils.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/utils.js b/frontend/src/utils.js
index 613b5e1..d99089b 100644
--- a/frontend/src/utils.js
+++ b/frontend/src/utils.js
@@ -1127,7 +1127,6 @@ class DataUtils {
 				},
 			],
 		},
-<<<<<<< Updated upstream
 	];
 
 	static dummyWarrantyData = [
@@ -1281,8 +1280,6 @@ class DataUtils {
 			warrantyType: "Parts Only",
 			systemType: "Commercial Irrigation",
 		},
-=======
->>>>>>> Stashed changes
 	];
 }