Skip to content

Commit 8ac838d

Browse files
authored
Merge branch 'main' into sync-5d2f7105
2 parents f8670f0 + fc0bf2c commit 8ac838d

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

src/components/Layout/Page.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,9 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
159159
}
160160
{showSurvey && (
161161
<>
162-
<<<<<<< HEAD
163-
<div className="flex flex-col items-center m-4 p-4">
164-
<p className="font-bold text-primary dark:text-primary-dark text-lg mb-4">
165-
এই ডকুমেন্টেশনগুলো আপনার কতটুকু ভাল লাগছে?
166-
=======
167162
<div className="flex flex-col items-center p-4 m-4">
168163
<p className="mb-4 text-lg font-bold text-primary dark:text-primary-dark">
169164
How do you like these docs?
170-
>>>>>>> 5d2f7105bd6374e465b8bdce8efceaeb8f01c937
171165
</p>
172166
<div>
173167
<ButtonLink

src/content/community/team.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ Current members of the React team are listed in alphabetical order below.
4242
Josh majored in Mathematics and discovered programming while in college. His first professional developer job was to program insurance rate calculations in Microsoft Excel, the paragon of Reactive Programming which must be why he now works on React. In between that time Josh has been an IC, Manager, and Executive at a few startups. outside of work he likes to push his limits with cooking.
4343
</TeamMember>
4444

45+
<TeamMember name="Kathryn Middleton" permalink="kathryn-middleton" photo="/images/team/kathryn-middleton.jpg" github="kmiddleton14" twitter="kmiddleton14" title="Engineering Manager at Meta">
46+
Kathryn initially discovered web development when she wanted to make her myspace page look cool. She ended up majoring in Computer Science, and quickly became a huge fan of React building features on the Instagram.com team. Outside of work she loves playing pingpong, teaching spin classes, and going plant shopping.
47+
</TeamMember>
48+
4549
<TeamMember name="Lauren Tan" permalink="lauren-tan" photo="/images/team/lauren.jpg" github="poteto" twitter="potetotes" threads="potetotes" personal="no.lol" title="Engineer at Meta">
4650
Lauren’s programming career peaked when she first discovered the `<marquee>` tag. She’s been chasing that high ever since. When she’s not adding bugs into React, she enjoys dropping cheeky memes in chat, and playing all too many video games with her partner, and her dog Zelda.
4751
</TeamMember>
@@ -64,6 +68,7 @@ Current members of the React team are listed in alphabetical order below.
6468

6569
<TeamMember name="Rick Hanlon" permalink="rick-hanlon" photo="/images/team/rickhanlonii.jpg" github="rickhanlonii" twitter="rickhanlonii" threads="rickhanlonii" personal="rickhanlon.codes" title="Engineer at Meta">
6670
Ricky majored in theoretical math and somehow found himself on the React Native team for a couple years before joining the React team. When he's not programming you can find him snowboarding, biking, climbing, golfing, or closing GitHub issues that do not match the issue template.
71+
6772
</TeamMember>
6873

6974
<TeamMember name="Sathya Gunasekaran " permalink="sathya-gunasekaran" photo="/images/team/sathya.jpg" github="gsathya" twitter="_gsathya" threads="gsathya.03" title="Engineer at Meta">

0 commit comments

Comments
 (0)