Skip to content

Commit a3a1d99

Browse files
Resolve merge conflict in README.md
2 parents 6901445 + 448955a commit a3a1d99

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
# Getting Started with Create React App
23

34
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
@@ -68,3 +69,6 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
6869
### `npm run build` fails to minify
6970

7071
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
72+
=======
73+
# waiting_coder
74+
>>>>>>> 448955ae922127eebf14d19152a3621728bc3a1d

0 commit comments

Comments
 (0)