init

7176e194 · stan.gao · 0a3ab3dc · 7176e194
Commit 7176e194 authored Dec 27, 2019 by stan.gao 🏀
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

README.md README.md +0 -5

No files found.
--- a/README.md
+++ b/README.md
-<<<<<<< HEAD
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

 ## Available Scripts
@@ -43,7 +42,3 @@ You don’t have to ever use `eject`. The curated feature set is suitable for sm
 You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

 To learn React, check out the [React documentation](https://reactjs.org/).
-=======
-# pc-client-ts
-
->>>>>>> 13e90a6b1ed217fccfbba0f64da5fd363aeaf7dd