fixed conflict

asantarissy · asantarissy · commit c26ccde3ea60 · 2019-08-24T17:14:27.000+03:00
diff --git a/content/community/articles.md b/content/community/articles.md
@@ -6,23 +6,11 @@ sectionid: community
 permalink: community/articles.html
 ---
 
-<<<<<<< HEAD
-
 - [كيف React](https://github.com/petehunt/react-howto) - دليل Pete Hunt لنظام React.
 - [9 أشياء يجب أن يعرفها كل مبتدئ في React.js](https://camjackson.net/post/9-things-every-reactjs-beginner-should-know) - دليل كام جاكسون للمبتدئين.
 - [React لحظات الإدراك](https://tylermcginnis.com/react-aha-moments/) - مقالة تايلر مكجينيس حول مجموعته من لحظات الإدراك مع React.
 - [تنقصك نقطة React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - مقالة دان أبراموف حول أفضل أجزاء React.
 - [الجدول الزمني لتعلم React](https://daveceddia.com/timeline-for-learning-react/) - الجدول الزمني الموصى به من قِبل ديف سيديا لتعلم React ونظامه.
 - [تطوير بسيط بـ React في 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - دليل جوشوا كومو لعرض مدى سهولة بدء التطوير بـ React.
 - [دليل مرئي للحالة في React](https://daveceddia.com/visual-guide-to-state-in-react/) - دليل ديف سيديا المرئي للحالة في React.
-- [التدريب العملي على لتعلم React Hooks](https://www.telerik.com/kendo-react-ui/react-hooks-guide/)
-=======
-- [React How-to](https://github.com/petehunt/react-howto) - Pete Hunt's guide to the React ecosystem.
-- [9 things every React.js beginner should know](https://camjackson.net/post/9-things-every-reactjs-beginner-should-know) - Cam Jackson's guide for beginners.
-- [React "Aha" Moments](https://tylermcginnis.com/react-aha-moments/) - Tyler McGinnis' article on his collection of "Aha" moments with React.
-- [You're missing the point of React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - Dan Abramov's article about the best parts of React.
-- [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's recommended timeline for learning React and the React ecosystem.
-- [Simple React Development in 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - Joshua Comeau's guide to showcase how easy it can be to start modern React development.
-- [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state.
-- [The Hands-On Guide to Learning React Hooks](https://www.telerik.com/kendo-react-ui/react-hooks-guide/) - Eric Bishard's step-by-step guide to learning React Hooks.
->>>>>>> de497e250340ff597ce4964279369f16315b8b4b
+- [التدريب العملي على لتعلم React Hooks](https://www.telerik.com/kendo-react-ui/react-hooks-guide/) دليل Eric Bishard خطوة بخطوة لتعلم الخطافات
diff --git a/content/community/conferences.md b/content/community/conferences.md
@@ -81,19 +81,12 @@ August 29, 2019. Tehran, Iran.
 4-6 مايو ، 2020. أتلانتا ، جورجيا ، الولايات المتحدة.80
 [موقع الويب](https://renderatl.com)
 
-<<<<<<< HEAD
-## المؤتمرات السابقة {#past-conferences}
-=======
-[Website](https://renderatl.com)
-
 ### React Next 2020 {#react-next-2020}
-June 15, 2020. Tel Aviv, Israel.
+يونيو 15, 2020. تل أبيب، إسرائيل.
 
-[Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/) 
+[موقع الويب](https://react-next.com/) - [تويتر](https://twitter.com/reactnext) - [فيس بوك](https://www.facebook.com/ReactNext2016/) 
 
-
-## Past Conferences {#past-conferences}
->>>>>>> de497e250340ff597ce4964279369f16315b8b4b
+## المؤتمرات السابقة {#past-conferences}
 
 ### React.js Conf 2015 {#reactjs-conf-2015}
 28 و 29 يناير في Facebook HQ ، كاليفورنيا.
diff --git a/content/community/meetups.md b/content/community/meetups.md
@@ -6,7 +6,6 @@ sectionid: community
 permalink: community/meetups.html
 ---
 
-<<<<<<< HEAD
 هل لديك مُلْتَقى React.js محلي؟ أضفه هنا!(يرجى الحفاظ على ترتيب القائمة أبجديًا)
 
 ## إسبانيا {#spain}
@@ -17,6 +16,7 @@ permalink: community/meetups.html
 * [بريزبان](https://www.meetup.com/reactbris/)
 * [سيدني](https://www.meetup.com/React-Sydney/)
 * [ملبورن](https://www.meetup.com/React-Melbourne/)
+* 
 
 <!-- 404 NOT FOUND ! -->
 
@@ -60,6 +60,7 @@ permalink: community/meetups.html
   
 ## الهند {#india}
 * [بنغالور](https://www.meetup.com/ReactJS-Bangalore/)
+* [شانديغار](https://www.meetup.com/Chandigarh-React-Developers/)
 * [تشيناي](https://www.meetup.com/React-Chennai/)
 * [دلهي](https://www.meetup.com/React-Delhi-NCR/)
 * [جايبور](https://www.meetup.com/JaipurJS-Developer-Meetup/)
@@ -160,160 +161,7 @@ permalink: community/meetups.html
 
 ## سنغافورة {#singapore}
 * [سنغافورة - React Knowledgeable](https://reactknowledgeable.org/)
-=======
-Do you have a local React.js meetup? Add it here! (Please keep the list alphabetical)
 
-## Australia {#australia}
-* [Brisbane](https://www.meetup.com/reactbris/)
-* [Melbourne](https://www.meetup.com/React-Melbourne/)
-* [Sydney](https://www.meetup.com/React-Sydney/)
-
-## Austria {#austria}
-* [Vienna](https://www.meetup.com/Vienna-ReactJS-Meetup/)
-
-## Belgium {#belgium}
-* [Belgium](https://www.meetup.com/ReactJS-Belgium/)
-
-## Brazil {#brazil}
-* [Belo Horizonte](https://www.meetup.com/reactbh/)
-* [Curitiba](https://www.meetup.com/pt-br/ReactJS-CWB/)
-* [Joinville](https://www.meetup.com/pt-BR/React-Joinville/)
-* [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/)
-* [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/)
-
-## Bolivia {#bolivia}
-* [Bolivia](https://www.meetup.com/ReactBolivia/)
-
-## Canada {#canada}
-* [Montreal, QC - ReactJS](https://www.meetup.com/fr-FR/ReactMontreal/)
-* [Montreal, QC - React Native](https://www.meetup.com/fr-FR/React-Native-MTL/)
-* [Vancouver, BC](https://www.meetup.com/ReactJS-Vancouver-Meetup/)
-* [Ottawa, ON](https://www.meetup.com/Ottawa-ReactJS-Meetup/)
-
-## China {#china}
-* [Beijing](https://www.meetup.com/Beijing-ReactJS-Meetup/)
-
-## Colombia {#colombia}
-* [Medellin](https://www.meetup.com/React-Medellin/)
-
-## Denmark {#denmark}
-* [Aalborg](https://www.meetup.com/Aalborg-React-React-Native-Meetup/)
-* [Aarhus](https://www.meetup.com/Aarhus-ReactJS-Meetup/)
-
-## England (UK) {#england-uk}
-* [Manchester](https://www.meetup.com/Manchester-React-User-Group/)
-* [React.JS Girls London](https://www.meetup.com/ReactJS-Girls-London/)
-
-## France {#france}
-* [Paris](https://www.meetup.com/ReactJS-Paris/)
-
-## Germany {#germany}
-* [Düsseldorf](https://www.meetup.com/de-DE/ReactJS-Meetup-Dusseldorf/)
-* [Hamburg](https://www.meetup.com/Hamburg-React-js-Meetup/)
-* [Karlsruhe](https://www.meetup.com/react_ka/)
-* [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/)
-* [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/)
-* [React Berlin](https://www.meetup.com/React-Berlin/)
-* [React.JS Girls Berlin](https://www.meetup.com/ReactJS-Girls-Berlin/)
-
-## Greece {#greece}
-* [Thessaloniki](https://www.meetup.com/Thessaloniki-ReactJS-Meetup/)
-
-## Hungary {#hungary}
-* [Budapest](https://www.meetup.com/React-Budapest/)
-
-## India {#india}
-* [Bangalore](https://www.meetup.com/ReactJS-Bangalore/)
-* [Chandigarh](https://www.meetup.com/Chandigarh-React-Developers/)
-* [Chennai](https://www.meetup.com/React-Chennai/)
-* [Delhi NCR](https://www.meetup.com/React-Delhi-NCR/)
-* [Jaipur](https://www.meetup.com/JaipurJS-Developer-Meetup/)
-
-## Ireland {#ireland}
-* [Dublin](https://www.meetup.com/ReactJS-Dublin/)
-
-## Israel {#israel}
-* [Tel Aviv](https://www.meetup.com/ReactJS-Israel/)
-
-## Malaysia {#malaysia}
-* [Penang](https://www.facebook.com/groups/reactpenang/)
-
-## Netherlands {#netherlands}
-* [Amsterdam](https://www.meetup.com/React-Amsterdam/)
-
-## New Zealand {#new-zealand}
-* [Wellington](https://www.meetup.com/React-Wellington/)
-
-## Norway {#norway}
-* [Norway](https://reactjs-norway.webflow.io/)
-* [Oslo](https://www.meetup.com/ReactJS-Oslo-Meetup/)
-
-## Pakistan {#pakistan}
-* [Karachi](https://www.facebook.com/groups/902678696597634/)
-* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
-
-## Peru {#peru}
-* [Lima](https://www.meetup.com/ReactJS-Peru/)
-
-## Philippines {#philippines}
-* [Manila](https://www.meetup.com/reactjs-developers-manila/)
-
-## Poland {#poland}
-* [Warsaw](https://www.meetup.com/React-js-Warsaw/)
-
-## Portugal {#portugal}
-* [Lisbon](https://www.meetup.com/JavaScript-Lisbon/)
-
-## Scotland (UK) {#scotland-uk}
-* [Edinburgh](https://www.meetup.com/React-Scotland/)
-
-## Singapore {#singapore}
-* [Singapore - React Knowledgeable](https://reactknowledgeable.org/)
-
-## Spain {#spain}
-* [Barcelona](https://www.meetup.com/ReactJS-Barcelona/)
-* [Canarias](https://www.meetup.com/React-Canarias/)
-
-## Sweden {#sweden}
-* [Goteborg](https://www.meetup.com/ReactJS-Goteborg/)
-
-## Ukraine {#ukraine}
-* [Kyiv](https://www.meetup.com/Kyiv-ReactJS-Meetup)
-
-## US {#us}
-* [Atlanta, GA - ReactJS](https://www.meetup.com/React-ATL/)
-* [Austin, TX - ReactJS](https://www.meetup.com/ReactJS-Austin-Meetup/)
-* [Boston, MA - ReactJS](https://www.meetup.com/ReactJS-Boston/)
-* [Boston, MA - React Native](https://www.meetup.com/Boston-React-Native-Meetup/)
-* [Chicago, IL - ReactJS](https://www.meetup.com/React-Chicago/)
-* [Columbus, OH - ReactJS](https://www.meetup.com/ReactJS-Columbus-meetup/)
-* [Dallas, TX - ReactJS](https://www.meetup.com/ReactDallas/)
-* [Irvine, CA - ReactJS](https://www.meetup.com/ReactJS-OC/)
-* [Kansas City, MO - ReactJS](https://www.meetup.com/Kansas-City-React-Meetup/)
-* [Las Vegas, NV - ReactJS](https://www.meetup.com/ReactVegas/)
-* [Leesburg, VA - ReactJS](https://www.meetup.com/React-NOVA/)
-* [Los Angeles, CA - ReactJS](https://www.meetup.com/socal-react/)
-* [Los Angeles, CA - React Native](https://www.meetup.com/React-Native-Los-Angeles/)
-* [Miami, FL - ReactJS](https://www.meetup.com/React-Miami/)
-* [Nashville, TN - ReactJS](https://www.meetup.com/NashReact-Meetup/)
-* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
-* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
-* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
-* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
-* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/)
-* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
-* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
-* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)
-* [Provo, UT - ReactJS](https://www.meetup.com/ReactJS-Utah/)
-* [Sacramento, CA - ReactJS](https://www.meetup.com/Sacramento-ReactJS-Meetup/)
-* [San Francisco - Real World React](https://www.meetup.com/Real-World-React)
-* [San Francisco - ReactJS](https://www.meetup.com/ReactJS-San-Francisco/)
-* [San Francisco, CA - React Native](https://www.meetup.com/React-Native-San-Francisco/)
-* [San Ramon, CA - TriValley Coders](https://www.meetup.com/trivalleycoders/)
-* [Santa Monica, CA - ReactJS](https://www.meetup.com/Los-Angeles-ReactJS-User-Group/)
-* [Seattle, WA - React Native](https://www.meetup.com/Seattle-React-Native-Meetup/)
-* [Seattle, WA - ReactJS](https://www.meetup.com/seattle-react-js/)
-* [Tampa, FL - ReactJS](https://www.meetup.com/ReactJS-Tampa-Bay/)
-* [Tucson, AZ - ReactJS](https://www.meetup.com/Tucson-ReactJS-Meetup/)
-* [Washington, DC - ReactJS](https://www.meetup.com/React-DC/)
->>>>>>> de497e250340ff597ce4964279369f16315b8b4b
+## ماليزيا {#malaysia}
+* [بينانغ](https://www.facebook.com/groups/reactpenang/)
+* 
diff --git a/content/docs/addons-test-utils.md b/content/docs/addons-test-utils.md
@@ -124,11 +124,7 @@ it('can render and update a counter', () => {
 
 - لا تنسَ أنَّ إرسال أحداث DOM يعمل عند إضافة حاوية DOM إلى `document` فقط. تستطيع استعمال مساعد مثل [React Testing Library](https://testing-library.com/react) لتقليل الشيفرة المتداولة (boilerplate code).
 
-<<<<<<< HEAD
 - [`recipes`](/docs/testing-recipes.html) تحتوي على المزيد من المعلومات حول كيفية عمل وطريقة استخدات `act()`.
-=======
-- The [`recipes`](/docs/testing-recipes.html) document contains more details on how `act()` behaves, with examples and usage.
->>>>>>> de497e250340ff597ce4964279369f16315b8b4b
 
 * * *
 
diff --git a/content/docs/hooks-faq.md b/content/docs/hooks-faq.md
@@ -71,12 +71,7 @@ prev: hooks-reference.html
 
 لاحظ أن **لتمكين الخطافات ، يجب أن تكون جميع حزم  16.8.0 React    أو أعلى**. لن تعمل الخطافات إذا نسيت التحديث ، على سبيل المثال ،  React DOM.
 
-<<<<<<< HEAD
-=======
-[React Native 0.59](https://facebook.github.io/react-native/blog/2019/03/12/releasing-react-native-059) and above support Hooks.
->>>>>>> de497e250340ff597ce4964279369f16315b8b4b
-
-ستدعم ReactNative الخطافات دعمًا كاملًا في الإصدار المستقر القادم.
+الاصدار [React Native 0.59](https://facebook.github.io/react-native/blog/2019/03/12/releasing-react-native-059) وما بعد يدعم الخطافات.
 
 ### هل احتاج إلى إعادة كتابة جميع مكونات الأصناف الخاصة بي؟ {#do-i-need-to-rewrite-all-my-class-components}
 
diff --git a/content/docs/hooks-intro.md b/content/docs/hooks-intro.md
@@ -31,12 +31,8 @@ function Example() {
 
 >Note
 >
-<<<<<<< HEAD
-> الإصدار 16.8.0 من React هو أول إصدار يدعم الخطافات. عند الترقية إليه، لا تنسَ تحديث جميع الحزم بما فيها React DOM. ستدعم ReactNative الخطافات في الإصدار المستقر القادم.
-=======
->React 16.8.0 is the first release to support Hooks. When upgrading, don't forget to update all packages, including React DOM.
->React Native supports Hooks since [the 0.59 release of React Native](https://facebook.github.io/react-native/blog/2019/03/12/releasing-react-native-059).
->>>>>>> de497e250340ff597ce4964279369f16315b8b4b
+> الإصدار 16.8.0 من React هو أول إصدار يدعم الخطافات. عند الترقية إليه، لا تنسَ تحديث جميع الحزم بما فيها React DOM.
+> React Native تدعم الخطافات في [اصدار 0.59](https://facebook.github.io/react-native/blog/2019/03/12/releasing-react-native-059).
 
 ## فيديو تقديمي {#video-introduction}
 
diff --git a/content/docs/jsx-in-depth.md b/content/docs/jsx-in-depth.md
@@ -423,11 +423,7 @@ function ListOfTenThings() {
 <div>{true}</div>
 ```
 
-<<<<<<< HEAD
 يُفيد هذا في التصيير الشرطي لعناصر React. ففي المثال التالي تُصيِّر JSX فقط المُكوِّن `<Header />`‎ إن كانت قيمة `showHeader` هي `true`:
-=======
-This can be useful to conditionally render React elements. This JSX renders the `<Header />` component only if `showHeader` is `true`:
->>>>>>> de497e250340ff597ce4964279369f16315b8b4b
 
 ```js{2}
 <div>
diff --git a/content/docs/optimizing-performance.md b/content/docs/optimizing-performance.md
diff --git a/content/docs/reference-test-renderer.md b/content/docs/reference-test-renderer.md
