Skip to content
Snippets Groups Projects
Commit cf5b7beb authored by Rayana Lyons's avatar Rayana Lyons
Browse files

Updated staff bio

parent a182c33f
No related branches found
No related tags found
2 merge requests!187Rlyons8 staff page,!156Main
Pipeline #577273 passed
......@@ -867,23 +867,6 @@ public class Staff {
"Norman Rockwell Self-Portrait"
);
}
<<<<<<< HEAD
<<<<<<< HEAD
public Employee rlyons8() {
return new Employee(
"Rayana",
"Student",
"Future cat lady",
"animegeek.jpeg",
"Black Anime Girl"
);
}
}
=======
=======
public Employee wgong21() {
return new Employee(
"William",
......@@ -896,7 +879,6 @@ public class Staff {
}
>>>>>>> 34a103314a3b19cd389b191ce6493362c369e627
public Employee pranavnt() {
return new Employee(
"Pranav",
......@@ -956,5 +938,4 @@ public class Staff {
);
}
}
>>>>>>> 311cbc24436a3ea467c0c94dab3b0a6982401e95
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