Skip to content

Commit 5d3aac6

Browse files
committed
conflict solved sync-303ecae3
1 parent 39ce58c commit 5d3aac6

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

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

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

106106
<Sandpack>
107107

108-
<<<<<<< HEAD
109-
```jsx App.js
110-
function ProductCategoryRow({category}) {
111-
=======
112108
```jsx src/App.js
113109
function ProductCategoryRow({ category }) {
114-
>>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
115110
return (
116111
<tr>
117112
<th colSpan="2">{category}</th>
@@ -342,13 +337,8 @@ function FilterableProductTable({ products }) {
342337
343338
<Sandpack>
344339
345-
<<<<<<< HEAD
346-
```jsx App.js
347-
import {useState} from 'react';
348-
=======
349340
```jsx src/App.js
350341
import { useState } from 'react';
351-
>>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
352342

353343
function FilterableProductTable({products}) {
354344
const [filterText, setFilterText] = useState('');
@@ -550,13 +540,8 @@ function SearchBar({
550540
551541
<Sandpack>
552542
553-
<<<<<<< HEAD
554-
```jsx App.js
555-
import {useState} from 'react';
556-
=======
557543
```jsx src/App.js
558544
import { useState } from 'react';
559-
>>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
560545

561546
function FilterableProductTable({products}) {
562547
const [filterText, setFilterText] = useState('');

0 commit comments

Comments
 (0)