Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sima bio added #262

Merged
merged 8 commits into from
Jun 17, 2024
Merged

sima bio added #262

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1fa1826
test
SimaRaha Jun 7, 2024
8ece7dc
fix conflict on people.xml
SimaRaha Jun 7, 2024
499527a
Merge branch 'main' into simaccvcontaint
SimaRaha Jun 10, 2024
84f776b
fix: Update people.yml, resolved merge conflict
SimaRaha Jun 10, 2024
0dec320
fix: removed images
SimaRaha Jun 10, 2024
d09c9de
fix: re-added images
SimaRaha Jun 10, 2024
d610008
Merge branch 'main' into simaccvcontaint
SimaRaha Jun 17, 2024
d91cb2a
Update about/people.yml
SimaRaha Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions about/people.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,17 @@ data:
brown_directory_uuid: 78e02962-a8af-46ec-8636-61237d83cb41
bio: Michael is a data science intern in the High Performance Computing division at CCV. He is in the Class of 2026 at Brown University studying Computer Science. His academic interests include software development, deep learning, and East Asian studies. Outside of work, you can find him playing basketball or listening to music.
image: michael1_main.jpg
<<<<<<< HEAD
name: Sima Raha
type: Part Time
team: Advanced Research Computing
subteam: Graphics, Software, and Data Core
title: Software Sustanibaility Intern
SimaRaha marked this conversation as resolved.
Show resolved Hide resolved
github_username: SimaRaha
brown_directory_uuid: cf68285e-47c5-4a65-897e-187c94e4f36b
bio: Sima Raha is a Software Sustainability Intern at CCV. She is Class of 2025, studying Economics and Data Fluency at Brown University. Her career interests include quantitative analysis, business intelligence (BI) development, and statistical programming. She enjoys hiking, nature photography, playing frisbee, and billiards.
image: sima_main.jpg
=======
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there's still a merge conflict marker here on line 433 and 443. The <<<<< HEAD line means "the following changes come from the current branch, until the ===== line." You need to delete lines 433 and 443 in order to resolve the merge conflict.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, and line 472.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@galenwinsor I already have line 433 in my local code. And the line 443 does not work for me to delete it. So, do I need to push the change to github?

- name: Melinda Zhang
type: Part Time
team: Advanced Research Computing
Expand Down Expand Up @@ -458,3 +469,4 @@ data:
bio: Sanjana is a data science intern working with the Computational Biology Core at CCV. She is concentrating in Computational Biology ('26) and is interested in genetics and public health. She also loves to read sci-fi, run, and spend time with friends!
image: sanjana_main.jpg

>>>>>>> main
Binary file added images/people/sima_hover.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/people/sima_main.JPG
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sure the file extension matches between the hover and main photo. In this case, make the extension of this file lowercase.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading