Merge branch 'main' into sync-c2d61310

orama254 · web-flow · commit 6f5625fa8f89 · 2025-03-05T17:02:34.000+03:00
diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md
@@ -75,7 +75,7 @@ June 14 & 18, 2024. In-person in Amsterdam, Netherlands + remote (hybrid event)
 ### React Norway 2024 {/*react-norway-2024*/}
 June 14, 2024. In-person at Farris Bad Hotel in Larvik, Norway and online (hybrid event).
 
-[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway)
+[Website](https://frontendnation.com/) - [Twitter](https://twitter.com/frontendnation)
 
 ### Render(ATL) 2024 🍑 {/*renderatl-2024-*/}
 June 12 - June 14, 2024. Atlanta, GA, USA
diff --git a/src/sidebarReference.json b/src/sidebarReference.json
@@ -179,7 +179,7 @@
     },
     {
 =======
->>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
+>>>>>>> 9967ded394d85af74e0ecdbf00feeb7921a28142
       "hasSectionHeader": true,
       "sectionHeader": "react-dom@{{version}}"
     },

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@`
`179`	`179`	`},`
`180`	`180`	`{`
`181`	`181`	`=======`
`182`		`->>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951`
	`182`	`+>>>>>>> 9967ded394d85af74e0ecdbf00feeb7921a28142`
`183`	`183`	`"hasSectionHeader": true,`
`184`	`184`	`"sectionHeader": "react-dom@{{version}}"`
`185`	`185`	`},`