Merge branch 'main' into sync-b7bf6c16

orama254 · web-flow · commit b62bcc904114 · 2025-03-05T16:18:20.000+03:00
diff --git a/src/sidebarReference.json b/src/sidebarReference.json
@@ -155,7 +155,6 @@
       ]
     },
     {
-<<<<<<< HEAD
       "title": "Directives",
       "path": "/reference/react/directives",
       "canary": true,
@@ -174,8 +173,6 @@
       ]
     },
     {
-=======
->>>>>>> b7bf6c16fb3152626a71c115b3242df6eb93bc6e
       "hasSectionHeader": true,
       "sectionHeader": "react-dom@{{version}}"
     },

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,6 @@`
`155`	`155`	`]`
`156`	`156`	`},`
`157`	`157`	`{`
`158`		`-<<<<<<< HEAD`
`159`	`158`	`"title": "Directives",`
`160`	`159`	`"path": "/reference/react/directives",`
`161`	`160`	`"canary": true,`
`@@ -174,8 +173,6 @@`
`174`	`173`	`]`
`175`	`174`	`},`
`176`	`175`	`{`
`177`		`-=======`
`178`		`->>>>>>> b7bf6c16fb3152626a71c115b3242df6eb93bc6e`
`179`	`176`	`"hasSectionHeader": true,`
`180`	`177`	`"sectionHeader": "react-dom@{{version}}"`
`181`	`178`	`},`