fix confilict

Author: mrbadri

package.json

@@ -21,13 +21,9 @@
     "postinstall": "yarn --cwd eslint-local-rules install && is-ci || husky install .husky",
     "check-all": "npm-run-all prettier lint:fix tsc rss",
     "rss": "node scripts/generateRss.js",
-<<<<<<< HEAD
-    "deadlinks": "node scripts/deadLinkChecker.js"
-=======
     "deadlinks": "node scripts/deadLinkChecker.js",
     "copyright": "node scripts/copyright.js",
     "test:eslint-local-rules": "yarn --cwd eslint-local-rules test"
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
   },
   "dependencies": {
     "@codesandbox/sandpack-react": "2.13.5",
@@ -67,11 +63,7 @@
     "asyncro": "^3.0.0",
     "autoprefixer": "^10.4.2",
     "babel-eslint": "10.x",
-<<<<<<< HEAD
-    "babel-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
-=======
     "babel-plugin-react-compiler": "^19.1.0-rc.3",
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
     "chalk": "4.1.2",
     "eslint": "7.x",
     "eslint-config-next": "12.0.3",

scripts/deadLinkChecker.js

@@ -1,13 +1,10 @@
 #!/usr/bin/env node
-<<<<<<< HEAD
-=======
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
 
 const fs = require('fs');
 const path = require('path');

src/components/MDX/Sandpack/ClearButton.tsx

@@ -1,13 +1,10 @@
-<<<<<<< HEAD
-=======
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  */

src/components/MDX/Sandpack/ReloadButton.tsx

@@ -1,13 +1,10 @@
-<<<<<<< HEAD
-=======
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  */

src/content/learn/add-react-to-an-existing-project.md

@@ -24,11 +24,7 @@ title: اضافه کردن ری‌اکت به یک پروژه موجود
 2. **`/some-app` را به‌عنوان *مسیر پایه*** در پیکربندی فریم‌ورک خود مشخص کنید (راهنما: [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath)، [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
 3. **سرور یا پروکسی خود را پیکربندی کنید** تا همه درخواست‌های زیر مسیر `/some-app/` توسط اپلیکیشن ری‌اکت شما مدیریت شوند.
 
-<<<<<<< HEAD
-این کار تضمین می‌کند که بخش ری‌اکت اپلیکیشن شما می‌تواند از [بهترین شیوه‌های موجود](/learn/build-a-react-app-from-scratch#consider-using-a-framework) که در این فریم‌ورک‌ها تعبیه شده‌اند بهره‌مند شود.
-=======
-This ensures the React part of your app can [benefit from the best practices](/learn/build-a-react-app-from-scratch#consider-using-a-framework) baked into those frameworks.
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
+این کار باعث می‌شود بخش React اپلیکیشن شما بتواند از [بهترین شیوه‌ها](/learn/build-a-react-app-from-scratch#consider-using-a-framework) که در این فریم‌ورک‌ها تعبیه شده‌اند، بهره‌مند شود.
 
 بسیاری از فریم‌ورک‌های مبتنی بر ری‌اکت فول‌استک هستند و به اپلیکیشن ری‌اکت شما اجازه می‌دهند از قابلیت‌های سرور استفاده کند. با این حال، حتی اگر نتوانید یا نخواهید جاوااسکریپت را روی سرور اجرا کنید، می‌توانید از همان رویکرد استفاده کنید. در این حالت، خروجی HTML/CSS/JS را (خروجی [`next export`](https://nextjs.org/docs/advanced-features/static-html-export) در Next.js یا حالت پیش‌فرض در Gatsby) در مسیر `/some-app/` سرو کنید.  
 

src/content/learn/react-compiler/introduction.md

@@ -28,11 +28,7 @@ React Compiler automatically optimizes your React application at build time. Rea
 
 Without the compiler, you need to manually memoize components and values to optimize re-renders:
 
-<<<<<<< HEAD
-```js
-=======
 ```js {expectedErrors: {'react-compiler': [4]}}
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
 import { useMemo, useCallback, memo } from 'react';
 
 const ExpensiveComponent = memo(function ExpensiveComponent({ data, onClick }) {

src/content/learn/separating-events-from-effects.md

@@ -990,11 +990,7 @@ To fix this code, it's enough to follow the rules.
 ```
 
 
-<<<<<<< HEAD
-```js
-=======
 ```js {expectedErrors: {'react-compiler': [14]}}
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
 import { useState, useEffect } from 'react';
 
 export default function Timer() {

src/content/reference/react/Activity.md

@@ -82,18 +82,10 @@ When you hide a component using an Activity boundary instead, React will "save"
 </Activity>
 ```
 
-<<<<<<< HEAD
-
-This makes it possible to hide and then later restore components in the state they were previously in.
-
-The following example has a sidebar with an expandable section. You can press "Overview" to reveal the three subitems below it. The main app area also has a button that hides and shows the sidebar.
-
-=======
 This makes it possible to hide and then later restore components in the state they were previously in.
 
 The following example has a sidebar with an expandable section. You can press "Overview" to reveal the three subitems below it. The main app area also has a button that hides and shows the sidebar.
 
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
 Try expanding the Overview section, and then toggling the sidebar closed then open:
 
 <Sandpack>

src/content/reference/react/index.md

@@ -37,15 +37,12 @@ The React Compiler is a build-time optimization tool that automatically memoizes
 * [Directives](/reference/react-compiler/directives) - Function-level directives to control compilation.
 * [Compiling Libraries](/reference/react-compiler/compiling-libraries) - Guide for shipping pre-compiled library code.
 
-<<<<<<< HEAD
-=======
 ## ESLint Plugin React Hooks {/*eslint-plugin-react-hooks*/}
 
 The [ESLint plugin for React Hooks](/reference/eslint-plugin-react-hooks) helps enforce the Rules of React:
 
 * [Lints](/reference/eslint-plugin-react-hooks) - Detailed documentation for each lint with examples.
 
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
 ## Rules of React {/*rules-of-react*/}
 
 React has idioms — or rules — for how to express patterns in a way that is easy to understand and yields high-quality applications:

src/content/reference/react/useTransition.md

@@ -2006,11 +2006,7 @@ export default function Item({action}) {
     startTransition(() => {
       action(e.target.value);
     });
-<<<<<<< HEAD
-  }  
-=======
   }
->>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
   return (
     <div className="item">
       <span>Eras Tour Tickets</span>