Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
faang
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CSE 391
24wi
faang
Commits
cf5b7beb
Commit
cf5b7beb
authored
1 year ago
by
Rayana Lyons
Browse files
Options
Downloads
Patches
Plain Diff
Updated staff bio
parent
a182c33f
No related branches found
No related tags found
2 merge requests
!187
Rlyons8 staff page
,
!156
Main
Pipeline
#577273
passed
1 year ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Staff.java
+0
-19
0 additions, 19 deletions
Staff.java
with
0 additions
and
19 deletions
Staff.java
+
0
−
19
View file @
cf5b7beb
...
...
@@ -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 {
}
>>>>>>>
34
a103314a3b19cd389b191ce6493362c369e627
public
Employee
pranavnt
()
{
return
new
Employee
(
"Pranav"
,
...
...
@@ -956,5 +938,4 @@ public class Staff {
);
}
}
>>>>>>>
311
cbc24436a3ea467c0c94dab3b0a6982401e95
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment