Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@ npm start

MIT

<<<<<<< HEAD
안녕하세요 그냥 이명일입니다.
=======
## 안녕하세요

잘부탁드립니다.

asdasdadsd
=======
## 한화우승
>>>>>>> 64f3931 (한화우승)
## 팀원 소개
김완기:
안녕하세요 김완기입니다.