Update README.md

carmentang · Feb 14, 2020 · e967c4b · e967c4b
1 parent 25df22b
commit e967c4b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
 
 ## Available Scripts
@@ -67,6 +66,3 @@ This section has moved here: https://facebook.github.io/create-react-app/docs/de
 ### `npm run build` fails to minify
 
 This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
-=======
-# rental-registry
->>>>>>> 30730c22da20fc3b2d21b8931299b271ff5651ee