resolve conflicts

Author: AhmedBaset

.eslintrc

@@ -9,12 +9,8 @@
     "react-hooks/exhaustive-deps": "error",
     "react/no-unknown-property": ["error", {"ignore": ["meta"]}],
     "react-compiler/react-compiler": "error",
-<<<<<<< HEAD
-    "local-rules/lint-markdown-code-blocks": "error"
-=======
     "local-rules/lint-markdown-code-blocks": "error",
     "no-trailing-spaces": "error"
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
   },
   "env": {
     "node": true,

next.config.js

@@ -18,8 +18,6 @@ const nextConfig = {
   experimental: {
     scrollRestoration: true,
     reactCompiler: true,
-<<<<<<< HEAD
-=======
   },
   async rewrites() {
     return {
@@ -44,7 +42,6 @@ const nextConfig = {
         },
       ],
     };
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
   },
   env: {},
   webpack: (config, {dev, isServer, ...options}) => {

package.json

@@ -6,12 +6,8 @@
   "scripts": {
     "analyze": "ANALYZE=true next build",
     "dev": "next-remote-watch ./src/content",
-<<<<<<< HEAD
-    "build": "next build && node --experimental-modules ./scripts/downloadFonts.mjs",
-=======
     "prebuild:rsc": "node scripts/buildRscWorker.mjs",
     "build": "node scripts/buildRscWorker.mjs && next build && node --experimental-modules ./scripts/downloadFonts.mjs",
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
     "lint": "next lint && eslint \"src/content/**/*.md\"",
     "lint:fix": "next lint --fix && eslint \"src/content/**/*.md\" --fix",
     "format:source": "prettier --config .prettierrc --write \"{plugins,src}/**/*.{js,ts,jsx,tsx,css}\"",
@@ -40,16 +36,10 @@
     "classnames": "^2.2.6",
     "debounce": "^1.2.1",
     "github-slugger": "^1.3.0",
-<<<<<<< HEAD
     "next": "15.4.8",
     "next-remote-watch": "^1.0.0",
     "parse-numeric-range": "^1.2.0",
-=======
-    "next": "15.1.12",
-    "next-remote-watch": "^1.0.0",
-    "parse-numeric-range": "^1.2.0",
     "raw-loader": "^4.0.2",
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
     "react": "^19.0.0",
     "react-collapsed": "4.0.4",
     "react-dom": "^19.0.0",
@@ -77,10 +67,7 @@
     "babel-eslint": "10.x",
     "babel-plugin-react-compiler": "^1.0.0",
     "chalk": "4.1.2",
-<<<<<<< HEAD
-=======
     "esbuild": "^0.24.0",
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
     "eslint": "7.x",
     "eslint-config-next": "12.0.3",
     "eslint-config-react-app": "^5.2.1",

src/components/MDX/Sandpack/NavigationBar.tsx

@@ -204,11 +204,7 @@ export function NavigationBar({
         <DownloadButton providedFiles={providedFiles} />
         <ReloadButton onReload={handleReload} />
         <ClearButton onClear={handleClear} />
-<<<<<<< HEAD
-        <OpenInCodeSandboxButton />
-=======
         {showOpenInCodeSandbox && <OpenInCodeSandboxButton />}
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
         {activeFile.endsWith('.tsx') && (
           <OpenInTypeScriptPlaygroundButton
             content={sandpack.files[activeFile]?.code || ''}

src/components/MDX/Sandpack/template.ts

@@ -35,13 +35,8 @@ root.render(
           eject: 'react-scripts eject',
         },
         dependencies: {
-<<<<<<< HEAD
-          react: '^19.2.0',
-          'react-dom': '^19.2.0',
-=======
           react: '^19.2.1',
           'react-dom': '^19.2.1',
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
           'react-scripts': '^5.0.0',
         },
       },

src/components/MDX/SandpackWithHTMLOutput.tsx

@@ -56,13 +56,8 @@ export default function formatHTML(markup) {
 const packageJSON = `
 {
   "dependencies": {
-<<<<<<< HEAD
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-=======
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
     "react-scripts": "^5.0.0",
     "html-format": "^1.1.2"
   },

src/components/MDX/TerminalBlock.tsx

@@ -79,11 +79,7 @@ function TerminalBlock({level = 'info', children}: TerminalBlockProps) {
           </div>
         </div>
       </div>
-<<<<<<< HEAD
-      <div
-=======
       <pre
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
         className="px-8 pt-4 pb-6 text-primary-dark dark:text-primary-dark font-mono text-code whitespace-pre overflow-x-auto"
         translate="no"
         dir="ltr">

src/components/PageHeading.tsx

@@ -18,11 +18,8 @@ import {useState, useEffect} from 'react';
 import {useRouter} from 'next/router';
 import {IconCanary} from './Icon/IconCanary';
 import {IconExperimental} from './Icon/IconExperimental';
-<<<<<<< HEAD
-=======
 import {IconCopy} from './Icon/IconCopy';
 import {Button} from './Button';
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 interface PageHeadingProps {
   title: string;

src/content/blog/2023/05/03/react-canaries.md

@@ -5,11 +5,7 @@ date: 2023/05/03
 description: We'd like to offer the React community an option to adopt individual new features as soon as their design is close to final, before they're released in a stable version--similar to how Meta has long used bleeding-edge versions of React internally. We are introducing a new officially supported [Canary release channel](/community/versioning-policy#canary-channel). It lets curated setups like frameworks decouple adoption of individual React features from the React release schedule.
 ---
 
-<<<<<<< HEAD
 في الثالث من مايو، 2023، كتبه [دان أبراموف](https://bsky.app/profile/danabra.mov)، [صوفي ألبرت](https://twitter.com/sophiebits)، [ريك هانلون](https://twitter.com/rickhanlonii)، [سيباستيان ماركباج](https://twitter.com/sebmarkbage)، و [أندرو كلارك](https://twitter.com/acdlite).
-=======
-May 3, 2023 by [Dan Abramov](https://bsky.app/profile/danabra.mov), [Sophie Alpert](https://twitter.com/sophiebits), [Rick Hanlon](https://twitter.com/rickhanlonii), [Sebastian Markbåge](https://twitter.com/sebmarkbage), and [Andrew Clark](https://twitter.com/acdlite)
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 ---
 

src/content/blog/2024/04/25/react-19-upgrade-guide.md

@@ -112,11 +112,7 @@ This will run the following codemods from `react-codemod`:
 - [`replace-reactdom-render`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-reactdom-render)
 - [`replace-string-ref`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-string-ref)
 - [`replace-act-import`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-act-import)
-<<<<<<< HEAD
 - [`replace-use-form-state`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-use-form-state) 
-=======
-- [`replace-use-form-state`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-use-form-state)
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 - [`prop-types-typescript`](https://github.com/reactjs/react-codemod#react-proptypes-to-prop-types)
 
 This does not include the TypeScript changes. See [TypeScript changes](#typescript-changes) below.