Skip to content

Commit e2e9d94

Browse files
authored
Merge branch 'main' into sync-50d6991c
2 parents a2b58f1 + 3dd441d commit e2e9d94

File tree

3 files changed

+1
-21
lines changed

3 files changed

+1
-21
lines changed
168 KB
Loading

src/components/PageHeading.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function PageHeading({
2727
tags = [],
2828
breadcrumbs,
2929
}: PageHeadingProps) {
30+
console.log('version', version);
3031
return (
3132
<div className="px-5 sm:px-12 pt-3.5">
3233
<div className="max-w-4xl ms-0 2xl:mx-auto">

src/sidebarReference.json

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -169,27 +169,6 @@
169169
]
170170
},
171171
{
172-
<<<<<<< HEAD
173-
"title": "Directives",
174-
"path": "/reference/react/directives",
175-
"canary": true,
176-
"routes": [
177-
{
178-
"title": "'use client'",
179-
"path": "/reference/react/use-client",
180-
"canary": true
181-
},
182-
{
183-
"title": "'use server'",
184-
"path": "/reference/react/use-server",
185-
"canary": true
186-
187-
}
188-
]
189-
},
190-
{
191-
=======
192-
>>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
193172
"hasSectionHeader": true,
194173
"sectionHeader": "react-dom@{{version}}"
195174
},

0 commit comments

Comments
 (0)