-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
sima bio added #262
Conversation
@galenwinsor Please review my changes and let me know the next steps. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good Sima, just resolve that merge conflict and fix the image file extension. Feel free to reach out to me if you have questions.
about/people.yml
Outdated
<<<<<<< HEAD | ||
name: Sima Raha | ||
type: Part Time | ||
team: Advanced Research Computing | ||
subteam: Graphics, Software, and Data Core | ||
title: Software Sustanibaility Intern | ||
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 | ||
======= |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, and line 472.
There was a problem hiding this comment.
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?
images/people/sima_main.JPG
Outdated
There was a problem hiding this comment.
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.
Visit the preview URL for this PR (updated for commit d91cb2a): https://ccv-brown-edu--pr262-simaccvcontaint-njuezl5q.web.app (expires Mon, 24 Jun 2024 15:00:24 GMT) 🔥 via Firebase Hosting GitHub Action 🌎 Sign: e6225babbaf68dadb99b2906d33811740e5d15cb |
@galenwinsor I'm curious why my bio doesn't appear on the website. |
@SimaRaha You need to merge this PR into main in order for it to show up on the actual website. Looks like you'll need to resolve conflicts prior to merging this in |
Sima pic and bio added to the CCV website.