Merge remote-tracking branch 'upstream/sync-315cb7a3' into review-sync

reactjs · Feb 18, 2024 · 1c0e32b · 1c0e32b
2 parents 73e60a9 + 5680ff4
commit 1c0e32b
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/content/learn/thinking-in-react.md b/src/content/learn/thinking-in-react.md
@@ -105,8 +105,13 @@ title: تفکر به سبک ری‌اکت
 
 <Sandpack>
 
+<<<<<<< HEAD
+```jsx App.js
+function ProductCategoryRow({category}) {
+=======
 ```jsx src/App.js
 function ProductCategoryRow({ category }) {
+>>>>>>> 315cb7a38a1645623fc55501429285ab680b8a6a
   return (
     <tr>
       <th colSpan="2">{category}</th>
@@ -337,8 +342,13 @@ function FilterableProductTable({ products }) {
 
 <Sandpack>
 
+<<<<<<< HEAD
+```jsx App.js
+import {useState} from 'react';
+=======
 ```jsx src/App.js
 import { useState } from 'react';
+>>>>>>> 315cb7a38a1645623fc55501429285ab680b8a6a
 
 function FilterableProductTable({products}) {
   const [filterText, setFilterText] = useState('');
@@ -540,8 +550,13 @@ function SearchBar({
 
 <Sandpack>
 
+<<<<<<< HEAD
+```jsx App.js
+import {useState} from 'react';
+=======
 ```jsx src/App.js
 import { useState } from 'react';
+>>>>>>> 315cb7a38a1645623fc55501429285ab680b8a6a
 
 function FilterableProductTable({products}) {
   const [filterText, setFilterText] = useState('');