From 9ed86037543f250e15a494aeda885176b72bfb5d Mon Sep 17 00:00:00 2001
From: Sirjan <sirjan1@cs.washington.edu>
Date: Tue, 13 Feb 2024 01:01:32 -0800
Subject: [PATCH] Fix merge conflicts
---
Products.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Products.java b/Products.java
index 9d7e829..463518c 100644
--- a/Products.java
+++ b/Products.java
@@ -849,7 +849,7 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
-<<<<<<< HEAD
+
public Product mshumaProduct() {
return new Product(
"Violin Mutes 100 pack",
@@ -888,9 +888,9 @@ public class Products { /* a good class, but not as good as cse391 */
"Windows 10 Default Wallpaper",
199.99
);
-=======
+
public Product sirjan1Product() {
- return new Product("A ball for soccer", "used for playing... soccer", "soccerball.jpg", "a..soccer..ball", 10000);
->>>>>>> 5158523 (Added my method to Products.java and Staff.java)
+ return new Product("A ball for soccer", "used for playing... soccer", "soccerball.jpg", "a..soccer..ball", 10000.0);
+
}
}
--
GitLab