From c11609a5b40dba79d8a167184ff39ce8b5cb6b09 Mon Sep 17 00:00:00 2001
From: Sriram Kutty <skutty@cs.washington.edu>
Date: Tue, 6 Feb 2024 15:17:53 -0800
Subject: [PATCH] Sriram's changes
---
Products.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Products.java b/Products.java
index 1b2bb2a..3c9ca49 100644
--- a/Products.java
+++ b/Products.java
@@ -110,7 +110,6 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
-<<<<<<< HEAD
public Product yixuan19Product(){
return new Product (
"Goomba",
@@ -118,7 +117,7 @@ public class Products { /* a good class, but not as good as cse391 */
"Avatar.png",
"Picture of Gawr Gura",
114514.0
-=======
+
public Product skuttyProduct() {
return new Product(
"Rake",
@@ -126,7 +125,6 @@ public class Products { /* a good class, but not as good as cse391 */
"rake.jpg",
"image of a rake",
5959.59
->>>>>>> skutty_staff_page
);
}
}
--
GitLab