From 0ba3bcb9e74e0fb752b4b0224b98acd56d0c8f9d Mon Sep 17 00:00:00 2001 From: kimseungeunn Date: Mon, 10 Apr 2023 01:02:20 +0900 Subject: [PATCH 1/8] =?UTF-8?q?profile=20=EB=82=B4=EC=9A=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3.commit/prfoile.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.commit/prfoile.txt b/3.commit/prfoile.txt index 9522792..ab67026 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ -email : -gitID : +email : seungeun.kim@myrealtrip.com +gitID : kimseungeunn From 36b5435cd23df131264d58ec8467ef0892a2a6d4 Mon Sep 17 00:00:00 2001 From: kimseungeunn Date: Tue, 11 Apr 2023 00:14:21 +0900 Subject: [PATCH 2/8] =?UTF-8?q?example02=EC=97=90=EC=84=9C=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EB=82=B4=EC=9A=A9=20=EB=B3=80=EA=B2=BD?= 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..84bc108 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (50/50) +낡은 나뭇가지(40/40) From 5cc1f5c1629d0a95a791f0a119d26c46772fa2cf Mon Sep 17 00:00:00 2001 From: kimseungeunn Date: Tue, 11 Apr 2023 00:15:23 +0900 Subject: [PATCH 3/8] =?UTF-8?q?example=20=091=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95=2015/14?= 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..20ecf40 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (15/50) +낡은 나뭇가지(14/40) From 79dedb617ccc3656ca6fb0979116e8e53353bc1b Mon Sep 17 00:00:00 2001 From: kimseungeunn Date: Tue, 11 Apr 2023 00:25:52 +0900 Subject: [PATCH 4/8] =?UTF-8?q?example02=EC=97=90=EC=84=9C=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=EC=88=98=EC=A0=95.=2035/34?= 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 84bc108..ed3e5ef 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (50/50) -낡은 나뭇가지(40/40) +깨진 구슬조각 (35/50) +낡은 나뭇가지(34/40) From b89f6bc93ba9c29043c903ec4b4683b82cb3acd5 Mon Sep 17 00:00:00 2001 From: kimseungeunn Date: Tue, 11 Apr 2023 00:28:18 +0900 Subject: [PATCH 5/8] =?UTF-8?q?45/40=20example1=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=A8.?= 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 20ecf40..ef90c10 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (15/50) -낡은 나뭇가지(14/40) +깨진 구슬조각 (45/50) +낡은 나뭇가지(40/40) From 95aba3d7f7f9e617b45e67000c42adcec61deb3a Mon Sep 17 00:00:00 2001 From: kimseungeunn Date: Tue, 11 Apr 2023 00:37:37 +0900 Subject: [PATCH 6/8] =?UTF-8?q?test=EB=B8=8C=EB=9E=9C=EC=B9=98=EC=97=90?= =?UTF-8?q?=EC=84=9C=20Quest=20=EC=99=84=EB=A3=8C?= 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 ef90c10..84bc108 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (45/50) +깨진 구슬조각 (50/50) 낡은 나뭇가지(40/40) From 1c5da46ee2d5f8bfa6f943fc60abe92569604c15 Mon Sep 17 00:00:00 2001 From: kimseungeunn Date: Mon, 19 Jun 2023 23:47:36 +0900 Subject: [PATCH 7/8] =?UTF-8?q?profile=ED=8C=8C=EC=9D=BC=20=EC=A0=9C?= =?UTF-8?q?=EB=AA=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3.commit/{prfoile.txt => profile.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 3.commit/{prfoile.txt => profile.txt} (100%) diff --git a/3.commit/prfoile.txt b/3.commit/profile.txt similarity index 100% rename from 3.commit/prfoile.txt rename to 3.commit/profile.txt From 14bb6383674f8002e642079f4b5963a2d77fb045 Mon Sep 17 00:00:00 2001 From: kimseungeunn Date: Mon, 19 Jun 2023 23:58:35 +0900 Subject: [PATCH 8/8] =?UTF-8?q?test02=EC=97=90=EC=84=9C=20=ED=91=B8?= =?UTF-8?q?=EC=89=AC.=20=EC=82=AC=EB=9D=BC=EC=A7=88=EC=98=88=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3.commit/profile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/3.commit/profile.txt b/3.commit/profile.txt index ab67026..9778249 100644 --- a/3.commit/profile.txt +++ b/3.commit/profile.txt @@ -1,2 +1,3 @@ email : seungeun.kim@myrealtrip.com gitID : kimseungeunn +깃 공부공부 test02브랜치에서 생성. main merge가 목표