test commit

2025-10-28 00:33:51 -05:00 · 2025-10-28 00:33:51 -05:00 · 0c921a3897
commit 0c921a3897
parent 0ce7addff7
1 changed files with 0 additions and 3 deletions
--- 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
 	];
 }