Skip to content
Snippets Groups Projects
Commit ac129f0b authored by Sriram Kutty's avatar Sriram Kutty
Browse files

Added new product and staff

parents bc7a26ca 155916a0
No related branches found
No related tags found
1 merge request!23Added new product and staff
Pipeline #576097 failed with stage
in 2 seconds
......@@ -110,6 +110,7 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
<<<<<<< HEAD
public Product yixuan19Product(){
return new Product (
"Goomba",
......@@ -117,6 +118,15 @@ 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",
"A rake to gather leaves",
"rake.jpg",
"image of a rake",
5959.59
>>>>>>> skutty_staff_page
);
}
}
......@@ -137,5 +137,14 @@ public class Staff {
"Goomba.jpg",
"Shaaaaaaaaark"
);
public Employee skutty() {
return new Employee(
"Sriram",
"Student",
"sleeping",
"cake.jpg",
"cake"
);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment