From 7d80870fa2237d433a2706a328ea090153f6847f Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 18:42:35 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=20:=20=EA=B5=AC=EC=8A=AC=2030=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index c44f904..eef50a0 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (30/50) +낡은 나뭇가지(4/40) From 33776554916b7842345f6084ac77eb595595f053 Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 18:42:58 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20:=20=EA=B5=AC=EC=8A=AC=2050=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index eef50a0..ea3cc88 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (30/50) +깨진 구슬조각 (50/50) 낡은 나뭇가지(4/40) From 4d9624f9b455440b13e49ae1b84c19e0379e5110 Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 18:47:42 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=20:=20=EB=82=98=EB=AD=87=EA=B0=80=EC=A7=80=2020?= =?UTF-8?q?=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index c44f904..fe45315 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (50/50) +낡은 나뭇가지(20/40) From cd9df94c61ce1426cc2d4b1776ad4bbebd717d75 Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 18:48:06 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20:=20=EB=82=98=EB=AD=87=EA=B0=80=EC=A7=80=2040?= =?UTF-8?q?=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index fe45315..84bc108 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (50/50) -낡은 나뭇가지(20/40) +낡은 나뭇가지(40/40) From 7fb1fe102a98411c7fb6e33cb2fe2a07bd7d41f0 Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 18:52:25 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=EB=A8=B8=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index a27c8b3..c71754a 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,3 +1,3 @@ 깨진 구슬조각 (50/50) -낡은 나뭇가지(4/40) +낡은 나뭇가지(40/40) From 6d6729cb86d64191d2463a365800f03930974e24 Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 19:22:29 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=EC=95=84=EB=B2=84=EC=A7=80=EA=B0=80=20?= =?UTF-8?q?=EB=B0=A9=EC=97=90=20=EB=93=A4=EC=96=B4=EA=B0=80=EC=8B=A0?= =?UTF-8?q?=EB=8B=A4=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 6.stash/hasTypo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ -아버지 가방에 들어가신댜규요? +아버지가 방에 들어가신다고요? From c40006e379a6719668ffacef57764fcfbaacd6ae Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 19:31:50 +0900 Subject: [PATCH 07/10] complete todoList --- 6.stash/todoList.txt | 2 ++ 1 file changed, 2 insertions(+) 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 From d4c8f051c176cb36591237edcabafcc10e2d2227 Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 19:33:03 +0900 Subject: [PATCH 08/10] Complete email, gitID --- 6.stash/prfoile.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From de656fea0a8c23a97df9c503b4219f60350db976 Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 22:22:19 +0900 Subject: [PATCH 09/10] add facebook follow --- "7.cherryPick/\355\214\224\353\241\234\354\232\260" | 1 + 1 file changed, 1 insertion(+) 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 From b36a6e718c739960f6bc8591a44df9031b434d23 Mon Sep 17 00:00:00 2001 From: Sunjoo IM Date: Tue, 2 May 2023 22:16:29 +0900 Subject: [PATCH 10/10] =?UTF-8?q?add=20facebook=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes .../\353\241\234\352\267\270\354\235\270" | 1 + 2 files changed, 1 insertion(+) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2bdf248458a9721c7cc42c33e4fc15e7d3e1a406 GIT binary patch literal 6148 zcmeHKO>fgc5S>j!vr$3vfl58D#5F1@i5ej;Zd#5-2qQQE3U+KYRvm9;JB_L+lF#sm z_$B>4y!~*cHo!3gv?I;F-PxHP?OSIzLqu%6h>wUoBH~bmtuC5hh?-ZrAuVg!1v0(H zoaU5L6_?X&!`m7DMh4W`aT?GeO-bVP?#?fgQlFtmLrg|gP)IqPW^_VtD5i5tV7s71 z9d_f~p<_6gRKdBVS+p##qD)4}@gus*(z5FJZ&_=n{b;wtJA99S31)H`RAIF!$6@hF zjou?~)bzvXLz*ln-qTZ=S7Dkbg$_vL1TLRHrg*TJd^na zg4BYKX{3prX|4*op||*XOzE;&qRHB1bLbdw3^)e1!+^bg_}+HXxh#$W$G|_tfVv+9 zRH1LNHmI)-G`a);wqe$SzN#fujIiiitPNrY!b~X8gfd%VFcS{DuztS9+Mo$1W{VGI zGc#MEFr6Li3++zKH|Sc&fMei313PBusrUc&@9Y2jL2l$2a18uc46ycDa5l!4?AyAr xIrY{G=vSx`6@c~o|>_T;bzQx)gED-lcK-1tF$G}z@_z7!)Xm$Vq literal 0 HcmV?d00001 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