Skip to content

Commit 3b34db0

Browse files
fix conflicts
1 parent 8add2fc commit 3b34db0

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/components/Layout/Page.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ import {useRouter} from 'next/router';
88
import {SidebarNav} from './SidebarNav';
99
import {Footer} from './Footer';
1010
import {Toc} from './Toc';
11-
<<<<<<< HEAD
12-
13-
=======
1411
// import SocialBanner from '../SocialBanner';
15-
>>>>>>> adb3bedd4bca408058e807d777ce5fd88ecd0794
1612
import {DocsPageFooter} from 'components/DocsFooter';
1713
import {Seo} from 'components/Seo';
1814
import PageHeading from 'components/PageHeading';
@@ -141,11 +137,7 @@ export function Page({
141137
/>
142138
</Head>
143139
)}
144-
<<<<<<< HEAD
145-
{/* <SocialBanner /> */}
146-
=======
147140
{/*<SocialBanner />*/}
148-
>>>>>>> adb3bedd4bca408058e807d777ce5fd88ecd0794
149141
<TopNav
150142
section={section}
151143
routeTree={routeTree}

0 commit comments

Comments
 (0)