docs(en): merging all conflicts

reactjs · Dec 24, 2024 · 6419643 · 6419643
2 parents de89f8b + b1a249d
commit 6419643
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/content/learn/react-developer-tools.md b/src/content/learn/react-developer-tools.md
@@ -56,7 +56,11 @@ react-devtools
 
 ## 移动端（React Native） {/*mobile-react-native*/}
 
+<<<<<<< HEAD
 你可以使用 [React Native DevTools](https://reactnative.dev/docs/debugging/react-native-devtools) 来检查 [React Native](https://reactnative.dev/) 应用程序，它的内置调试器与 React Developer Tools 进行了深度集成。所有功能与浏览器扩展的工作方式相同，包括本机元素突出显示和选择。
+=======
+To inspect apps built with [React Native](https://reactnative.dev/), you can use [React Native DevTools](https://reactnative.dev/docs/react-native-devtools), the built-in debugger that deeply integrates React Developer Tools. All features work identically to the browser extension, including native element highlighting and selection.
+>>>>>>> b1a249d597016c6584e4c186daa28b180cc9aafc
 
 [了解有关调试 React Native 的更多信息](https://reactnative.dev/docs/debugging)。