merging all conflicts

Author: react-translations-bot

src/content/community/conferences.md

@@ -15,8 +15,14 @@ August 17 & 18, 2023. Salt Lake City, UT, USA
 
 [Website](https://www.reactrally.com/) - [Twitter](https://twitter.com/ReactRally) - [Instagram](https://www.instagram.com/reactrally/)
 
+### React Native EU 2023 {/*react-native-eu-2023*/}
+September 7 & 8, 2023. Wrocław, Poland
+
+[Website](https://react-native.eu) - [Twitter](https://twitter.com/react_native_eu) - [Facebook](https://www.facebook.com/reactnativeeu)
+
+
 ### React India 2023 {/*react-india-2023*/}
-Oct 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day
+October 5 - 7, 2023. In-person in Goa, India (hybrid event) + Oct 3 2023 - remote day
 
 [Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w)
 

src/content/community/meetups.md

@@ -89,6 +89,7 @@ permalink: community/meetups.html
 ## المجر {/*hungary*/}
 ** [بودابست](https://www.meetup.com/React-Budestival/)
 
+<<<<<<< HEAD
 ## الهند {/*india*/}
 ** [بنغالور](https://www.meetup.com/ReactJS-Bangalore/)
 * [بنغالور](https://www.meetup.com/React-Native-Bangalore-Meetup)
@@ -97,6 +98,15 @@ permalink: community/meetups.html
 * [دلهي إن سي آر](https://www.meetup.com/React-Delhi-NCR/)
 * [جايبور](https://www.meetup.com/JaipurJS-Developer-Meetup/)
 * [بيون](https://www.meetup.com/ReactJS-and-Friends/)
+=======
+## India {/*india*/}
+* [Ahmedabad](https://www.meetup.com/react-ahmedabad/)
+* [Bangalore (React)](https://www.meetup.com/ReactJS-Bangalore/)
+* [Bangalore (React Native)](https://www.meetup.com/React-Native-Bangalore-Meetup)
+* [Chennai](https://www.meetup.com/React-Chennai/)
+* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
+* [Pune](https://www.meetup.com/ReactJS-and-Friends/)
+>>>>>>> 722b54640ea8ef146ef59558100819a6bb31c252
 
 ## إندونيسيا {/*indonesia*/}
 ** [إندونيسيا](https://www.meetup.com/reactindonesia/)

src/content/reference/react/use-client.md

@@ -59,7 +59,15 @@ export default function RichTextEditor(props) {
 ## الاستخدام {/*usage*/}
 
 <Wip>
+This section is a work in progress. 
 
+<<<<<<< HEAD
 هذا القسم غير مكتمل، شاهد أيضًا [توثيق Next.js لمكونات الخادم](https://beta.nextjs.org/docs/rendering/server-and-client-components).
 
 </Wip>
+=======
+This API can be used in any framework that supports React Server Components. You may find additional documentation from them.
+* [Next.js documentation](https://nextjs.org/docs/getting-started/react-essentials)
+* More coming soon
+</Wip>
+>>>>>>> 722b54640ea8ef146ef59558100819a6bb31c252

src/content/reference/react/use-server.md

@@ -47,8 +47,16 @@ async function addToCart(data) {
 ## Usage {/*usage*/}
 
 <Wip>
+This section is a work in progress. 
 
+<<<<<<< HEAD
 This section is incomplete. See also the [Next.js documentation for Server Components](https://beta.nextjs.org/docs/rendering/server-and-client-components).
 
 </Wip>
 >>>>>>> 819518cfe32dd2db3b765410247c30feea713c77
+=======
+This API can be used in any framework that supports React Server Components. You may find additional documentation from them.
+* [Next.js documentation](https://nextjs.org/docs/getting-started/react-essentials)
+* More coming soon
+</Wip>
+>>>>>>> 722b54640ea8ef146ef59558100819a6bb31c252