Resolve merge conflicts

reactjs · Dec 18, 2023 · 725dc1c · 725dc1c
1 parent 218b97b
commit 725dc1c
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/content/learn/importing-and-exporting-components.md b/src/content/learn/importing-and-exporting-components.md
@@ -285,13 +285,8 @@ export default function App() {
 }
 ```
 
-<<<<<<< HEAD
-```js Gallery.js active
-// Перенесіть мене у Profile.js!
-=======
 ```js src/Gallery.js active
-// Move me to Profile.js!
->>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
+// Перенесіть мене у Profile.js!
 export function Profile() {
   return (
     <img