From 2c679e4e6465523b3c1f9886d8bea1e05ffaa557 Mon Sep 17 00:00:00 2001
From: Arohan <aagate@cs.washington.edu>
Date: Tue, 13 Feb 2024 00:23:47 -0800
Subject: [PATCH] Merge main into aagate_staff_page
---
Products.java | 4 +---
Staff.java | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Products.java b/Products.java
index 69f8bd0..1e9db46 100644
--- a/Products.java
+++ b/Products.java
@@ -827,7 +827,6 @@ public class Products { /* a good class, but not as good as cse391 */
1000.0
);
}
-<<<<<<< HEAD
public Product aagateProduct() {
return new Product(
"Meta quest",
@@ -836,7 +835,7 @@ public class Products { /* a good class, but not as good as cse391 */
"A meta quest 3 on Amazon",
9.00
);
-=======
+ }
public Product acuraIntegra() {
return new Product (
@@ -856,6 +855,5 @@ public class Products { /* a good class, but not as good as cse391 */
"Windows 10 Default Wallpaper",
199.99
);
->>>>>>> origin/main
}
}
diff --git a/Staff.java b/Staff.java
index a356e89..5280ca2 100644
--- a/Staff.java
+++ b/Staff.java
@@ -847,7 +847,6 @@ public class Staff {
"celsius picture"
);
}
-<<<<<<< HEAD
public Employee aagate() {
return new Employee(
"Arohan",
@@ -856,7 +855,7 @@ public class Staff {
"sloth.jpg",
"picture of a sloth"
);
-=======
+ }
public Employee kristong() {
return new Employee (
@@ -876,7 +875,6 @@ public class Staff {
"your-name.jpg",
"Wallpaper of Movie Your Name"
);
->>>>>>> origin/main
}
}
--
GitLab