diff --git a/11. firstPR/guestBook b/11. firstPR/guestBook index 5f07315..06e5733 100644 --- a/11. firstPR/guestBook +++ b/11. firstPR/guestBook @@ -1,2 +1,3 @@ |닉네임|gitID|후기| |------|------|------| +|shay0454|shay0454|git에 대해 기본적인 것을 알게 되었습니다.| \ No newline at end of file diff --git a/3.commit/prfoile.txt b/3.commit/prfoile.txt index 9522792..6f38432 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ -email : -gitID : +email : shay0454@naver.com +gitID : shay0454 diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index c44f904..84bc108 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (50/50) +낡은 나뭇가지(40/40) diff --git a/6.stash/hasTypo.txt b/6.stash/hasTypo.txt index a4b9065..9bfad50 100644 --- a/6.stash/hasTypo.txt +++ b/6.stash/hasTypo.txt @@ -1 +1 @@ -아버지 가방에 들어가신댜규요? +아버지가 방에 들어가신댜규요? diff --git a/6.stash/todoList.txt b/6.stash/todoList.txt index e69de29..316be99 100644 --- a/6.stash/todoList.txt +++ b/6.stash/todoList.txt @@ -0,0 +1 @@ +1. SDL 공부 \ No newline at end of file diff --git "a/7.cherryPick/\353\241\234\352\267\270\354\235\270" "b/7.cherryPick/\353\241\234\352\267\270\354\235\270" index 2fa30c2..ab04349 100644 --- "a/7.cherryPick/\353\241\234\352\267\270\354\235\270" +++ "b/7.cherryPick/\353\241\234\352\267\270\354\235\270" @@ -1 +1,2 @@ 기능 +1. 페이스북으로 로그인 \ No newline at end of file diff --git "a/7.cherryPick/\355\214\224\353\241\234\354\232\260" "b/7.cherryPick/\355\214\224\353\241\234\354\232\260" index 2fa30c2..2d06a77 100644 --- "a/7.cherryPick/\355\214\224\353\241\234\354\232\260" +++ "b/7.cherryPick/\355\214\224\353\241\234\354\232\260" @@ -1 +1,2 @@ 기능 +페이스북 팔로우 기능 \ No newline at end of file diff --git a/9.rebase/food b/9.rebase/food index bb5e882..c29ef48 100644 --- a/9.rebase/food +++ b/9.rebase/food @@ -1,3 +1,3 @@ -1. mainDish (0/1) -2. pasta (0/2) -3. drink (0/4) +1. mainDish (1/1) +2. pasta (2/2) +3. drink (4/4) diff --git a/README.md b/README.md index 9e114a7..ff3a7b2 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ 1. 화면 왼쪽 위에 Fork 버튼을 눌러 레포지토리를 포크 해주세요. 2. Code를 눌러서 git Clone을 해주세요. 혹은 GUI에서 git clone을 진행해주세요. 3. 각각의 챕터에 가서 다시 readme를 읽으면서 진행해주세요! +4. 레포지토리 마음에 드셨으면 Star를 눌러주세요!