From 87f8b26d7dab9f5e27ea2873602fd16aac72a61f Mon Sep 17 00:00:00 2001 From: Srikanth Kandi Date: Tue, 5 Nov 2024 22:04:57 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=80=20Fix:=20merge=20conflict=20on=20t?= =?UTF-8?q?eam.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/content/community/team.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/content/community/team.md b/src/content/community/team.md index f7f6b169..407448f4 100644 --- a/src/content/community/team.md +++ b/src/content/community/team.md @@ -42,15 +42,7 @@ Current members of the React team are listed in alphabetical order below. 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. -<<<<<<< HEAD - - 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. - - - -======= ->>>>>>> 8201e7e9203321bd1648c3ab0b76ef943c9ec3ad Lauren's programming career peaked when she first discovered the `` tag. She’s been chasing that high ever since. She studied Finance instead of CS in college, so she learned to code using Excel instead of Java. Lauren enjoys dropping cheeky memes in chat, playing video games with her partner, and petting her dog Zelda.