From d661678b86fd906689a836385736e80bb82a4ade Mon Sep 17 00:00:00 2001 From: lauren Date: Mon, 25 Mar 2024 13:44:51 -0400 Subject: [PATCH 1/2] Update @eps1lon's job title (#6710) Congrats! https://twitter.com/sebsilbermann/status/1772229730747490691 --- 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 2ea4e79b8a..bb28fe886c 100644 --- a/src/content/community/team.md +++ b/src/content/community/team.md @@ -74,7 +74,7 @@ Current members of the React team are listed in alphabetical order below. Sebastian majored in psychology. He's usually quiet. Even when he says something, it often doesn't make sense to the rest of us until a few months later. The correct way to pronounce his surname is "mark-boa-geh" but he settled for "mark-beige" out of pragmatism -- and that's how he approaches React. - + Sebastian learned programming to make the browser games he played during class more enjoyable. Eventually this lead to contributing to as much open source code as possible. Outside of coding he's busy making sure people don't confuse him with the other Sebastians and Zilberman of the React community. From 92b7584de7fd3c18019585532226607b791dcbdf Mon Sep 17 00:00:00 2001 From: Xavi Lee Date: Tue, 26 Mar 2024 11:11:46 +0800 Subject: [PATCH 2/2] fix conflict --- 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 e0955c3d6c..a860e90670 100644 --- a/src/content/community/team.md +++ b/src/content/community/team.md @@ -74,13 +74,8 @@ React 核心团队成员全职致力于核心组件 API 的开发，负责 React Sebastian 主修心理学。他通常比较沉默寡言。即使他说些什么，我们其他人通常也要等几个月后才能理解他的意思。他的姓氏正确的发音是“mark-boa-geh”，但出于实用考虑，他接受了“mark-beige”的发音——这也是他处理 React 问题的方式。 -<<<<<<< HEAD - - Sebastian 学习编程的目的是让他在课堂上玩的浏览器游戏变得更有趣。最终，这引领他尽可能多地为开源代码做贡献。在编程之外，他忙于确保人们不会把他和 React 社区的其他 Sebastians 和 Zilberman 混淆。 -======= - Sebastian learned programming to make the browser games he played during class more enjoyable. Eventually this lead to contributing to as much open source code as possible. Outside of coding he's busy making sure people don't confuse him with the other Sebastians and Zilberman of the React community. ->>>>>>> d661678b86fd906689a836385736e80bb82a4ade + Sebastian 学习编程的目的是让他在课堂上玩的浏览器游戏变得更有趣。最终，这引领他尽可能多地为开源代码做贡献。在编程之外，他忙于确保人们不会把他和 React 社区的其他 Sebastians 和 Zilberman 混淆。