fix conflict

reactjs · Jan 15, 2025 · 2e38291 · 2e38291
1 parent 10aa00e
commit 2e38291
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/content/learn/add-react-to-an-existing-project.md b/src/content/learn/add-react-to-an-existing-project.md
@@ -62,12 +62,8 @@ npm install react react-dom
 <html>
   <head><title>My app</title></head>
   <body>
-<<<<<<< HEAD
     <!-- 你现有的页面内容（在这个例子中，它将被替换） -->
-=======
-    <!-- Your existing page content (in this example, it gets replaced) -->
     <div id="root"></div>
->>>>>>> ee8a829f99ee813f36fed1f553b2deee5a1cc0b4
   </body>
 </html>
 ```