Handle sync conflicts

reactjs · Jul 26, 2023 · 859335a · 859335a
1 parent fb254ea
commit 859335a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 33 deletions.
diff --git a/src/components/Layout/HomeContent.js b/src/components/Layout/HomeContent.js
@@ -3,44 +3,29 @@
  */
 
 import {
-<<<<<<< HEAD
-  Fragment,
-=======
-  createContext,
-  memo,
-  useState,
-  useContext,
-  useId,
->>>>>>> b9eea4da28db66591ae5935898f98acdf009a0ad
   Suspense,
   createContext,
   memo,
   useContext,
   useEffect,
-<<<<<<< HEAD
   useId,
-  useReducer,
   useRef,
   useState,
-=======
-  useRef,
->>>>>>> b9eea4da28db66591ae5935898f98acdf009a0ad
   useTransition,
 } from 'react';
 
-import BlogCard from 'components/MDX/BlogCard';
-import ButtonLink from '../ButtonLink';
-import CodeBlock from 'components/MDX/CodeBlock';
+import cn from 'classnames';
 import {ExternalLink} from 'components/ExternalLink';
 import {IconChevron} from 'components/Icon/IconChevron';
-import {IconNavArrow} from 'components/Icon/IconNavArrow';
-import {IconRestart} from '../Icon/IconRestart';
 import {IconSearch} from 'components/Icon/IconSearch';
-import Link from 'components/MDX/Link';
 import {Logo} from 'components/Logo';
+import BlogCard from 'components/MDX/BlogCard';
+import CodeBlock from 'components/MDX/CodeBlock';
+import Link from 'components/MDX/Link';
 import NextLink from 'next/link';
-import cn from 'classnames';
 import sidebarBlog from '../../sidebarBlog.json';
+import ButtonLink from '../ButtonLink';
+import {IconRestart} from '../Icon/IconRestart';
 
 function Section({children, background = null}) {
   return (

diff --git a/src/components/Layout/TopNav/TopNav.tsx b/src/components/Layout/TopNav/TopNav.tsx
@@ -4,6 +4,7 @@
 
 import * as React from 'react';
 
+import {disableBodyScroll, enableBodyScroll} from 'body-scroll-lock';
 import {
   Suspense,
   startTransition,
@@ -12,26 +13,18 @@ import {
   useRef,
   useState,
 } from 'react';
-import {disableBodyScroll, enableBodyScroll} from 'body-scroll-lock';
 
-import {Feedback} from '../Feedback';
+import cn from 'classnames';
 import {IconClose} from 'components/Icon/IconClose';
 import {IconHamburger} from 'components/Icon/IconHamburger';
 import {IconSearch} from 'components/Icon/IconSearch';
-import {Logo} from '../../Logo';
-<<<<<<< HEAD
-import NextLink from 'next/link';
-import type {RouteItem} from '../getRouteMeta';
 import {Search} from 'components/Search';
-import {SidebarLink} from '../Sidebar';
-import {SidebarRouteTree} from '../Sidebar/SidebarRouteTree';
-import cn from 'classnames';
+import NextLink from 'next/link';
 import {useRouter} from 'next/router';
-=======
+import {Logo} from '../../Logo';
 import {Feedback} from '../Feedback';
-import {SidebarRouteTree} from '../Sidebar';
+import {SidebarRouteTree} from '../Sidebar/SidebarRouteTree';
 import type {RouteItem} from '../getRouteMeta';
->>>>>>> b9eea4da28db66591ae5935898f98acdf009a0ad
 
 declare global {
   interface Window {