Merge pull request #58 from reactjs/sync-169d5c18

Sync with react.dev @ 169d5c1
reactjs · Aug 20, 2024 · 95f65e0 · 95f65e0
2 parents 3b8a6f3 + 23f457d
commit 95f65e0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md
@@ -10,7 +10,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
 
 ## Upcoming Conferences {/*upcoming-conferences*/}
 
-
 ### React Paris 2024 {/*react-paris-2024*/}
 March 22, 2024. In-person in Paris, France + Remote (hybrid)
 
@@ -52,7 +51,6 @@ June 4 - 7, 2024. Online
 
 [Website](https://frontendnation.com/) - [Twitter](https://twitter.com/frontendnation)
 
-
 ### React Summit 2024 {/*react-summit-2024*/}
 June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
 

diff --git a/src/content/learn/installation.md b/src/content/learn/installation.md
@@ -37,11 +37,9 @@ export default function App() {
 
 Дәл осы жерде код жазуға немесе жоғарғы оң жақ бұрыштағы «Fork» түймесін басу арқылы кодты жаңа табта ашуға болады.
 
-<<<<<<< HEAD
 Мұндай құмжәшіктер React құжаттамасының беттерінің көпшілігінде қолжетімді. React құжаттамасынан басқа, React-ті қолдайтын көптеген онлайн құмжәшіктері бар: мысалы, [CodeSandbox](https://codesandbox.io/s/new), [StackBlitz](https://stackblitz.com/fork/react), немесе [CodePen.](https://codepen.io/pen?&editors=0010&layout=left&prefill_data_id=3f4569d1-1b11-4bce-bd46-89090eed5ddb)
-=======
+
 Most pages in the React documentation contain sandboxes like this. Outside of the React documentation, there are many online sandboxes that support React: for example, [CodeSandbox](https://codesandbox.io/s/new), [StackBlitz](https://stackblitz.com/fork/react), or [CodePen.](https://codepen.io/pen?template=QWYVwWN)
->>>>>>> 56df8af577407c69889f24a4c7d9ddb54745a26b
 
 ### Локальде React-тi қолданып көріңіз {/*try-react-locally*/}