diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..2bdf248 Binary files /dev/null and b/.DS_Store differ diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index c44f904..c71754a 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,3 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (50/50) +낡은 나뭇가지(40/40) + diff --git a/6.stash/hasTypo.txt b/6.stash/hasTypo.txt index a4b9065..05d98ca 100644 --- a/6.stash/hasTypo.txt +++ b/6.stash/hasTypo.txt @@ -1 +1 @@ -아버지 가방에 들어가신댜규요? +아버지가 방에 들어가신다고요? diff --git a/6.stash/prfoile.txt b/6.stash/prfoile.txt index 20cf4d0..37a468a 100644 --- a/6.stash/prfoile.txt +++ b/6.stash/prfoile.txt @@ -1,2 +1,2 @@ -email : 이메일을 다시 작성해주세요 -gitID : 깃아이디를 입력해주세요 +email : email@gmial.com +gitID : snnzzoo diff --git a/6.stash/todoList.txt b/6.stash/todoList.txt index e69de29..90bbd4a 100644 --- a/6.stash/todoList.txt +++ b/6.stash/todoList.txt @@ -0,0 +1,2 @@ +1. 밥을 먹는다. +2. 운동을 한다. \ 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..12cf632 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 @@ 기능 +1. Facebook 팔로우 기능 \ No newline at end of file