Skip to content

Commit 39ce58c

Browse files
committed
Merge remote-tracking branch 'upstream/sync-303ecae3' into review-sync
2 parents d9fc426 + 265aab0 commit 39ce58c

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

src/content/learn/thinking-in-react.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,13 @@ title: تفکر به سبک ری‌اکت
105105

106106
<Sandpack>
107107

108+
<<<<<<< HEAD
109+
```jsx App.js
110+
function ProductCategoryRow({category}) {
111+
=======
108112
```jsx src/App.js
109113
function ProductCategoryRow({ category }) {
114+
>>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
110115
return (
111116
<tr>
112117
<th colSpan="2">{category}</th>
@@ -337,8 +342,13 @@ function FilterableProductTable({ products }) {
337342
338343
<Sandpack>
339344
345+
<<<<<<< HEAD
346+
```jsx App.js
347+
import {useState} from 'react';
348+
=======
340349
```jsx src/App.js
341350
import { useState } from 'react';
351+
>>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
342352
343353
function FilterableProductTable({products}) {
344354
const [filterText, setFilterText] = useState('');
@@ -540,8 +550,13 @@ function SearchBar({
540550
541551
<Sandpack>
542552
553+
<<<<<<< HEAD
554+
```jsx App.js
555+
import {useState} from 'react';
556+
=======
543557
```jsx src/App.js
544558
import { useState } from 'react';
559+
>>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
545560
546561
function FilterableProductTable({products}) {
547562
const [filterText, setFilterText] = useState('');

0 commit comments

Comments
 (0)