Skip to content

Commit 582f048

Browse files
committed
Resolve merge conflict in website markdown file(_projects/website.md): remove Gayle and Nayan
2 parents eed5962 + 5324c74 commit 582f048

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

_data/internal/communities/data-science.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ leadership:
2828
links:
2929
- name: Slack
3030
url: https://app.slack.com/client/T04502KQX/CGRATJCCF
31-
- name: Github
31+
- name: GitHub
3232
url: https://github.com/hackforla/data-science/
3333

3434
recruiting-message:

_includes/about-page/about-card-news.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
</div>
1212
{% endfor %}
1313
</div>
14-
{% for testemonial in site.data.internal.testimonials %}
14+
{% for testimonial in site.data.internal.testimonials %}
1515
<div class="garcetti-quote"><div class="entire-quote"><img class="quote-marks" src="/assets/images/about/quotes.png" alt="">
16-
<p class="quote-text"> {{testemonial.quote}}</p>
16+
<p class="quote-text"> {{testimonial.quote}}</p>
1717
</div>
18-
<cite class="mayor-cite">&#8212; {{testemonial.source}}</cite>
19-
<img id="quote-tmc" src="{{testemonial.img_url}}" alt="{{testemonial.source}}">
18+
<cite class="mayor-cite">&#8212; {{testimonial.source}}</cite>
19+
<img id="quote-tmc" src="{{testimonial.img_url}}" alt="{{testimonial.source}}">
2020
</div>
2121
{% endfor %}
2222

_projects/tdm-calculator.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ leadership:
5555
slack: https://hackforla.slack.com/team/U064M7X48SY
5656
github: https://github.com/heejung-hong
5757
picture: https://avatars.githubusercontent.com/heejung-hong
58+
- name: Marlena Mellody Khim-Sai
59+
github-handle: marlenamellody
60+
role: UX Design Lead
61+
links:
62+
slack: https://hackforla.slack.com/team/U06DSRCSXRD
63+
github: https://github.com/marlenamellody
64+
picture: https://avatars.githubusercontent.com/marlenamellody
5865
links:
5966
- name: GitHub
6067
url: 'https://github.com/hackforla/tdm-calculator'

_projects/website.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@ leadership:
5151
slack: 'https://hackforla.slack.com/team/U04MJA414LU'
5252
github: 'https://github.com/Thinking-Panda'
5353
picture: https://avatars.githubusercontent.com/Thinking-Panda
54-
- name: Nayan Bhatt
55-
github-handle: freaky4wrld
56-
role: Merge Team
57-
links:
58-
slack: 'https://hackforla.slack.com/team/U05TZLLJAUV'
59-
github: 'https://github.com/freaky4wrld'
60-
picture: https://avatars.githubusercontent.com/freaky4wrld
6154
- name: Mario Antonini
6255
github-handle:
6356
role: Merge Team

0 commit comments

Comments
 (0)