From ab209d663a9b55e2cd660659a4734034b7b4d5ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:09:46 +0900 Subject: [PATCH 01/16] =?UTF-8?q?[=EC=B2=AB=20=EC=BB=A4=EB=B0=8B]=20-?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B=ED=95=B4=EB=B4=85=EB=8B=88=EB=8B=A4.?= 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..5b2a9e2 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ -email : -gitID : +email : 냠냠 +gitID : jsh0801 From 028aae1d6353fe44821811585c63a3d304151b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:16:18 +0900 Subject: [PATCH 02/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EC=B2=AB=20=EC=A0=80=EC=9E=A5?= 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..f6cc681 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (8/50) +낡은 나뭇가지(4/40) From b243f2e492bfa1539acf27c0c602804bdda4323b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:18:12 +0900 Subject: [PATCH 03/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EA=B5=AC=EC=8A=AC30=EA=B0=9C=20=ED=9A=8D=EB=93=9D?= 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 f6cc681..eef50a0 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (8/50) +깨진 구슬조각 (30/50) 낡은 나뭇가지(4/40) From c6cb12ef885ce5b9a8bd195b4659ef5e8dbc6314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:18:50 +0900 Subject: [PATCH 04/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EA=B5=AC=EC=8A=AC50=EA=B0=9C(=EC=99=84)=20=ED=9A=8D?= =?UTF-8?q?=EB=93=9D?= 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 d91af96a264eee615a652a2b5b751019ccb8c70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:21:14 +0900 Subject: [PATCH 05/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EB=82=98=EB=AC=B420=EA=B0=9C=20=ED=9A=8D=EB=93=9D?= 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 f6cc681..6ea5c89 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (8/50) -낡은 나뭇가지(4/40) +낡은 나뭇가지(20/40) From 22b933f0d5b6ad49eb031f9183fcda48acb62b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:21:48 +0900 Subject: [PATCH 06/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EB=82=98=EB=AC=B440=EA=B0=9C=20=ED=9A=8D=EB=93=9D?= 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 6ea5c89..ac828c1 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (8/50) -낡은 나뭇가지(20/40) +낡은 나뭇가지(40/40) From 688f206d107a386bbd68b897d5b59f0db9b86d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:25:58 +0900 Subject: [PATCH 07/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EA=B5=AC=EC=8A=AC=20=EC=A0=9C=EA=B1=B0?= 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 e1a7b22..d598303 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (50/50) +깨진 구슬조각 (0/50) 낡은 나뭇가지(40/40) \ No newline at end of file From 46a48b8cc14e1f4e0cbf1a11ce7456e5ab5eeb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:28:29 +0900 Subject: [PATCH 08/16] =?UTF-8?q?---=20=EB=8B=A4=EC=8B=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 d598303..e1a7b22 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) +깨진 구슬조각 (50/50) 낡은 나뭇가지(40/40) \ No newline at end of file From c975a5aa40a4925d023b29152785e80dcdcb0b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:29:07 +0900 Subject: [PATCH 09/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EA=B5=AC=EC=8A=AC=20=EC=A0=9C=EA=B1=B0?= 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 e1a7b22..d598303 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (50/50) +깨진 구슬조각 (0/50) 낡은 나뭇가지(40/40) \ No newline at end of file From 1c2162a5f8701df0c94dd5035932b915e217d052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:29:32 +0900 Subject: [PATCH 10/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EB=82=98=EB=AC=B4=20=EC=A0=9C=EA=B1=B0?= 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 e1a7b22..dd32008 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (50/50) -낡은 나뭇가지(40/40) \ No newline at end of file +낡은 나뭇가지(0/40) \ No newline at end of file From df715b7e322fb19a141ee7898aba725ed1bfd1d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:32:20 +0900 Subject: [PATCH 11/16] =?UTF-8?q?---=20=EB=8B=A4=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index 84ca82c..84bc108 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,7 +1,2 @@ -<<<<<<< HEAD -깨진 구슬조각 (0/50) -낡은 나뭇가지(40/40) -======= 깨진 구슬조각 (50/50) -낡은 나뭇가지(0/40) ->>>>>>> 머지실습2 +낡은 나뭇가지(40/40) From 54ab58b14c1276cdd154dd029824c0bba3b48445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:34:23 +0900 Subject: [PATCH 12/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EA=B5=AC=EC=8A=AC=20=EC=A0=9C=EA=B1=B0?= 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 84bc108..e800f6e 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (50/50) +깨진 구슬조각 (0/50) 낡은 나뭇가지(40/40) From 316a8d1e3d57cbf715108ac15fda66d69fbe8cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:34:58 +0900 Subject: [PATCH 13/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EB=82=98=EB=AC=B4=20=EC=A0=9C=EA=B1=B0?= 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 84bc108..bf9d969 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (50/50) -낡은 나뭇가지(40/40) +낡은 나뭇가지(0/40) From 77951f4e7454229613882aea9273f5a0f7b3379b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:44:36 +0900 Subject: [PATCH 14/16] =?UTF-8?q?---=20=EB=A7=88=EC=A7=80=EB=A7=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index 6702642..c44f904 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,5 +1,2 @@ -<<<<<<< HEAD 깨진 구슬조각 (0/50) 낡은 나뭇가지(0/40) -======= ->>>>>>> 머지실 From 37705bb8b27205585bce00bd89b0953793f93aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:45:18 +0900 Subject: [PATCH 15/16] =?UTF-8?q?[=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EA=B5=AC=EC=8A=AC50=EA=B0=9C(=EC=99=84)=20=ED=9A=8D?= =?UTF-8?q?=EB=93=9D?= 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 c44f904..bf9d969 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) +깨진 구슬조각 (50/50) 낡은 나뭇가지(0/40) From 0e0eb17a285229a9f1d1aba25fbb44792eb96747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=84=9C=ED=95=B4?= Date: Wed, 17 May 2023 11:45:53 +0900 Subject: [PATCH 16/16] =?UTF-8?q?=EB=A8=B8=EC=A7=80=20=EC=8B=A4=EC=8A=B5]?= =?UTF-8?q?=20-=20=EB=82=98=EB=AC=B440=EA=B0=9C(=EC=99=84)=20=ED=9A=8D?= =?UTF-8?q?=EB=93=9D?= 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 c44f904..e800f6e 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +낡은 나뭇가지(40/40)