From b214f78433756914ec32526dda48e76176dbf4fc Mon Sep 17 00:00:00 2001 From: Josh Story Date: Fri, 8 Nov 2024 13:33:37 -0800 Subject: [PATCH 1/2] Update socials for Josh Story (#7282) --- src/content/community/team.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/community/team.md b/src/content/community/team.md index 407448f48..221a8db87 100644 --- a/src/content/community/team.md +++ b/src/content/community/team.md @@ -38,7 +38,7 @@ Current members of the React team are listed in alphabetical order below. Joe was planning to major in math and philosophy but got into computer science after writing physics simulations in Matlab. Prior to React, he worked on Relay, RSocket.js, and the Skip programming language. While he’s not building some sort of reactive system he enjoys running, studying Japanese, and spending time with his family. - + 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. From 8b5c1c15d0367b876c17b554ea7c17fdc878ca95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rainer=20Mart=C3=ADnez=20Fraga?= Date: Sun, 10 Nov 2024 20:13:03 -0500 Subject: [PATCH 2/2] Resolve merge conflicts --- src/content/community/team.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/content/community/team.md b/src/content/community/team.md index a8f931291..59ce9cff8 100644 --- a/src/content/community/team.md +++ b/src/content/community/team.md @@ -38,13 +38,8 @@ Engineer at Meta Joe planeaba especializarse en matemáticas y filosofía, pero se metió en la informática después de escribir simulaciones de física en Matlab. Antes de React, trabajó en Relay, RSocket.js y el lenguaje de programación Skip. Cuando no está construyendo algún tipo de sistema reactivo, le gusta correr, estudiar japonés y pasar tiempo con su familia. -<<<<<<< HEAD - + Josh se especializó en Matemáticas y descubrió la programación en la universidad. Su primer trabajo como desarrollador profesional fue programar cálculos de tarifas de seguros en Microsoft Excel, el parangón de la Programación Reactiva, que debe ser la razón por la que ahora trabaja en React. En el medio de ese tiempo Josh ha sido un IC, Gerente y Ejecutivo en algunas nuevas empresas. fuera del trabajo le gusta empujar sus límites con la cocina. -======= - - 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. ->>>>>>> b214f78433756914ec32526dda48e76176dbf4fc