Skip to content

Commit 725dc1c

Browse files
committed
Resolve merge conflicts
1 parent 218b97b commit 725dc1c

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/content/learn/importing-and-exporting-components.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,8 @@ export default function App() {
285285
}
286286
```
287287

288-
<<<<<<< HEAD
289-
```js Gallery.js active
290-
// Перенесіть мене у Profile.js!
291-
=======
292288
```js src/Gallery.js active
293-
// Move me to Profile.js!
294-
>>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
289+
// Перенесіть мене у Profile.js!
295290
export function Profile() {
296291
return (
297292
<img

0 commit comments

Comments
 (0)