Skip to content

Commit ac9ca8c

Browse files
committed
docs(en): merging all conflicts
2 parents 2e788de + 2859efa commit ac9ca8c

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

src/content/community/meetups.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
4747
## Colombia {/*colombia*/}
4848
* [Medellin](https://www.meetup.com/React-Medellin/)
4949

50+
## Czechia {/*czechia*/}
51+
* [Prague](https://guild.host/react-prague/)
52+
5053
## Denmark {/*denmark*/}
5154
* [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/)
5255
* [Aarhus](https://www.meetup.com/Aarhus-ReactJS-Meetup/)

src/content/reference/react-dom/hooks/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ title: "Built-in React DOM Hooks"
1414

1515
**Form** 允许创建用于提交信息的交互式控件。要在组件中管理表单,请使用以下其中一个 Hook:
1616

17+
<<<<<<< HEAD
1718
* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) 允许根据表单的状态更新用户界面。
19+
=======
20+
* [`useFormStatus`](/reference/react-dom/hooks/useFormStatus) allows you to make updates to the UI based on the status of a form.
21+
>>>>>>> 2859efa07357dfc2927517ce9765515acf903c7c
1822
1923
```js
2024
function Form({ action }) {

0 commit comments

Comments
 (0)