From cf15fb0ef9e0d23b7c67e89bf68671262b2bf4ae Mon Sep 17 00:00:00 2001
From: tly6 <tly6@uw.edu>
Date: Mon, 12 Feb 2024 14:50:16 -0800
Subject: [PATCH] fixed Staff.java 2nd time
---
Staff.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Staff.java b/Staff.java
index 1cf7228..442d194 100644
--- a/Staff.java
+++ b/Staff.java
@@ -539,8 +539,6 @@ public class Staff {
);
}
-<<<<<<< Staff.java
-
public Employee tly6() {
return new Employee(
"Truong",
@@ -551,7 +549,6 @@ public class Staff {
);
}
-=======
public Employee ccsekhar20() {
return new Employee(
"Chaitanya",
--
GitLab