docs(en): merging all conflicts

reactjs · Nov 12, 2024 · e082668 · e082668
2 parents feb8319 + 3246989
commit e082668
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/content/learn/react-compiler.md b/src/content/learn/react-compiler.md
@@ -316,7 +316,11 @@ export default defineConfig({
 
 ### Expo {/*usage-with-expo*/}
 
+<<<<<<< HEAD
 请参考 [Expo 文档](https://docs.expo.dev/preview/react-compiler/) 应用程序中启用和使用 React Compiler。
+=======
+Please refer to [Expo's docs](https://docs.expo.dev/guides/react-compiler/) to enable and use the React Compiler in Expo apps.
+>>>>>>> 3246989c210dc5d4239b0638b2418572ba123ad4
 
 ### Metro (React Native) {/*usage-with-react-native-metro*/}