fix conflict

AhmedBaset · web-flow · commit 21129f1b9ccc · 2023-08-14T16:40:39.000+03:00
diff --git a/src/sidebarLearn.json b/src/sidebarLearn.json
@@ -37,15 +37,11 @@
           "path": "/learn/editor-setup"
         },
         {
-<<<<<<< HEAD
-          "title": "أدوات مطوري React",
-=======
           "title": "Using TypeScript",
           "path": "/learn/typescript"
         },
         {
-          "title": "React Developer Tools",
->>>>>>> 819518cfe32dd2db3b765410247c30feea713c77
+          "title": "أدوات مطوري React",
           "path": "/learn/react-developer-tools"
         }
       ]

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,11 @@`
`37`	`37`	`"path": "/learn/editor-setup"`
`38`	`38`	`},`
`39`	`39`	`{`
`40`		`-<<<<<<< HEAD`
`41`		`- "title": "أدوات مطوري React",`
`42`		`-=======`
`43`	`40`	`"title": "Using TypeScript",`
`44`	`41`	`"path": "/learn/typescript"`
`45`	`42`	`},`
`46`	`43`	`{`
`47`		`- "title": "React Developer Tools",`
`48`		`->>>>>>> 819518cfe32dd2db3b765410247c30feea713c77`
	`44`	`+ "title": "أدوات مطوري React",`
`49`	`45`	`"path": "/learn/react-developer-tools"`
`50`	`46`	`}`
`51`	`47`	`]`