From 27985169a841e6a523509104d3de9190e1e8a451 Mon Sep 17 00:00:00 2001 From: Ahmed Abdelbaset Date: Mon, 31 Jul 2023 14:36:28 +0300 Subject: [PATCH] fix: confilct on syncing --- src/content/reference/react-dom/index.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/content/reference/react-dom/index.md b/src/content/reference/react-dom/index.md index 7d16b2cba..06dca9952 100644 --- a/src/content/reference/react-dom/index.md +++ b/src/content/reference/react-dom/index.md @@ -36,15 +36,7 @@ title: React DOM APIs -<<<<<<< HEAD * تجد [`findDOMNode`](/reference/react-dom/findDOMNode) أقرب عنصر DOM يتوافق مع مثيل مكون `class`. * تقوم [`hydrate`](/reference/react-dom/hydrate) بتركيب شجرة في DOM التي تم إنشاؤها من HTML الذي تم تصييره في الخادم. مهجور لصالح [`hydrateRoot`](/reference/react-dom/client/hydrateRoot). * تقوم [`render`](/reference/react-dom/render) بتركيب شجرة في DOM. مهجور لصالح [`createRoot`](/reference/react-dom/client/createRoot). * تقوم [`unmountComponentAtNode`](/reference/react-dom/unmountComponentAtNode) بإلغاء تركيب شجرة من DOM. مهجور لصالح [`root.unmount()`.](/reference/react-dom/client/createRoot#root-unmount) -======= -* [`findDOMNode`](/reference/react-dom/findDOMNode) finds the closest DOM node corresponding to a class component instance. -* [`hydrate`](/reference/react-dom/hydrate) mounts a tree into the DOM created from server HTML. Deprecated in favor of [`hydrateRoot`](/reference/react-dom/client/hydrateRoot). -* [`render`](/reference/react-dom/render) mounts a tree into the DOM. Deprecated in favor of [`createRoot`](/reference/react-dom/client/createRoot). -* [`unmountComponentAtNode`](/reference/react-dom/unmountComponentAtNode) unmounts a tree from the DOM. Deprecated in favor of [`root.unmount()`](/reference/react-dom/client/createRoot#root-unmount). - ->>>>>>> a472775b7c15f41b21865db1698113ca49ca95c4