Conflicts fix

Author: arshadkazmi42

beta/package.json

@@ -22,11 +22,7 @@
     "check-all": "npm-run-all prettier lint:fix tsc"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "@codesandbox/sandpack-react": "0.13.16-experimental.0",
-=======
     "@codesandbox/sandpack-react": "v0.14.3-experimental.1",
->>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
     "@docsearch/css": "3.0.0-alpha.41",
     "@docsearch/react": "3.0.0-alpha.41",
     "@headlessui/react": "^1.3.0",

beta/src/components/MDX/Sandpack/index.tsx

@@ -15,11 +15,7 @@ const SandpackGlimmer = ({code}: {code: string}) => (
         <div className="px-4 lg:px-6">
           <div className="sp-tabs"></div>
         </div>
-<<<<<<< HEAD
-        <div className="px-3 flex items-center justify-end flex-grow text-right"></div>
-=======
         <div className="px-3 flex items-center justify-end grow text-right"></div>
->>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
       </div>
       <div className="sp-wrapper">
         <div className="sp-layout sp-custom-layout min-h-[216px]">

beta/src/pages/apis/useref.md

@@ -15,10 +15,7 @@ const ref = useRef(initialValue)
 - [Usage](#usage)
   - [Referencing a value with a ref](#referencing-a-value-with-a-ref)
   - [Manipulating the DOM with a ref](#manipulating-the-dom-with-a-ref)
-<<<<<<< HEAD
-=======
   - [Exposing a ref from your component](#exposing-a-ref-from-your-component)
->>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
   - [Avoiding recreating the ref contents](#avoiding-recreating-the-ref-contents)
 - [Reference](#reference)
   - [`useRef(initialValue)`](#useref)

beta/src/sidebarReference.json

@@ -16,13 +16,10 @@
               "path": "/apis/usestate"
             },
             {
-<<<<<<< HEAD
-=======
               "title": "useContext()",
               "path": "/apis/usecontext"
             },
             {
->>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
               "title": "useRef()",
               "path": "/apis/useref"
             }

beta/yarn.lock

@@ -547,32 +547,18 @@
     style-mod "^4.0.0"
     w3c-keyname "^2.2.4"
 
-<<<<<<< HEAD
-"@codesandbox/sandpack-client@^0.13.16-experimental.0":
-  version "0.13.16-experimental.0"
-  resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-client/-/sandpack-client-0.13.16-experimental.0.tgz#c8ef9e56e0cc2c264412f0e79cbc14f2e04c4479"
-  integrity sha512-n32sFGug1OksZR/4O7I9YYRs/p4JuVvjGPjf4xnDImKfs+butW9sLT8QzCfhad8QLfSGdzBHIyXPWrFe/zilvQ==
-=======
 "@codesandbox/sandpack-client@^0.14.3-experimental.0":
   version "0.14.3-experimental.0"
   resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-client/-/sandpack-client-0.14.3-experimental.0.tgz#1e4643e5d635528623edc8d45de582784aea4d1d"
   integrity sha512-7KWOV4mPcQQ0TUheCZV0AC0R51DrtfQysvYCvD8iYJh3f59qBFp8JA3OT0Ffgu27ej/AV5kuXHvFOCGvUD/LwA==
->>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
   dependencies:
     codesandbox-import-utils "^1.2.3"
     lodash.isequal "^4.5.0"
 
-<<<<<<< HEAD
-"@codesandbox/[email protected]":
-  version "0.13.16-experimental.0"
-  resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-react/-/sandpack-react-0.13.16-experimental.0.tgz#e8982aabc4a584e1ee261cd19606b9531be471f8"
-  integrity sha512-nXxwTwAA42b3AG2Lx6Mqi+yncG8BIACpXjau619KJQFqeoAkc6e2n0D5oYO/qrIean1CntB95xWfvSNbFX8K1Q==
-=======
 "@codesandbox/[email protected]":
   version "0.14.3-experimental.1"
   resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-react/-/sandpack-react-0.14.3-experimental.1.tgz#574eb822449089c77b29e0b8bc7ac1d8ee20d0be"
   integrity sha512-5jFVLJKunVPUgZi105p+nxjjTJN+w/MwO3abW/Ob17jp/UT6o+m1x5XhiJVpc832/jwWGrDGKukFMbOtk35CuQ==
->>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
   dependencies:
     "@code-hike/classer" "^0.0.0-aa6efee"
     "@codemirror/closebrackets" "^0.19.0"
@@ -588,11 +574,7 @@
     "@codemirror/matchbrackets" "^0.19.3"
     "@codemirror/state" "^0.19.6"
     "@codemirror/view" "^0.19.32"
-<<<<<<< HEAD
-    "@codesandbox/sandpack-client" "^0.13.16-experimental.0"
-=======
     "@codesandbox/sandpack-client" "^0.14.3-experimental.0"
->>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
     "@react-hook/intersection-observer" "^3.1.1"
     codesandbox-import-util-types "^2.2.3"
     codesandbox-import-utils "^2.2.3"