Skip to content

Commit a552569

Browse files
fix: resolved conflict
1 parent f49524a commit a552569

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

src/content/learn/index.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ title: 快速開始
44

55
<Intro>
66

7-
<<<<<<< HEAD
8-
歡迎來到 React 文件!本頁將為你介紹日常使用的 80% React 概念。
9-
=======
10-
Welcome to the React documentation! This page will give you an introduction to 80% of the React concepts that you will use on a daily basis.
11-
>>>>>>> 6ae99dddc3b503233291da96e8fd4b118ed6d682
7+
歡迎來到 React 文件!本頁將向介紹 80% 日常使用的 React 概念。
128

139
</Intro>
1410

src/content/learn/react-developer-tools.md

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -52,33 +52,10 @@ react-devtools
5252

5353
![React Developer Tools standalone](/images/docs/react-devtools-standalone.png)
5454

55-
<<<<<<< HEAD
5655
## 行動裝置(React Native) {/*mobile-react-native*/}
57-
React 開發者工具也可以用來檢測由 [React Native](https://reactnative.dev/) 建構的應用程式。
5856

59-
使用 React 開發者工具最簡單的方式就是全域安裝它:
60-
```bash
61-
# Yarn
62-
yarn global add react-devtools
63-
=======
64-
## Mobile (React Native) {/*mobile-react-native*/}
65-
66-
To inspect apps built with [React Native](https://reactnative.dev/), you can use [React Native DevTools](https://reactnative.dev/docs/debugging/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.
67-
>>>>>>> 6ae99dddc3b503233291da96e8fd4b118ed6d682
68-
69-
[Learn more about debugging in React Native.](https://reactnative.dev/docs/debugging)
70-
71-
<<<<<<< HEAD
72-
接著從 terminal 打開開發者工具:
73-
```bash
74-
react-devtools
75-
```
76-
77-
它應該連接到你任何在本機端執行的 React Native 應用程式。
57+
要檢查使用 [React Native](https://reactnative.dev/) 建立的應用程式,你可以使用 [React Native DevTools](https://reactnative.dev/docs/debugging/react-native-devtools), - 深度整合 React 開發工具的偵錯器。所有功能與瀏覽器擴充功能的工作方式相同,包括 native element 高亮顯示和選擇器。
7858

79-
> 如果在幾秒鐘內沒有連接上開發者工具,請嘗試重新載入應用程式。
59+
[了解有關 React Native 中 debug 的更多資訊。](https://reactnative.dev/docs/debugging)
8060

81-
[學習更多關於除錯 React Native 的方式。](https://reactnative.dev/docs/debugging)
82-
=======
83-
> For versions of React Native earlier than 0.76, please use the standalone build of React DevTools by following the [Safari and other browsers](#safari-and-other-browsers) guide above.
84-
>>>>>>> 6ae99dddc3b503233291da96e8fd4b118ed6d682
61+
> 對於早於 0.76 的 React Native 版本,請按照上面的 [Safari 和其他瀏覽器](#safari-and-other-browsers) 指南使用獨立建置的 React DevTools。

0 commit comments

Comments
 (0)