From a6117aa9b7f9161bbd9a7bebe2534f8261926f87 Mon Sep 17 00:00:00 2001 From: Leeo Date: Sat, 27 Aug 2022 11:23:40 +0900 Subject: [PATCH 01/22] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) 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를 눌러주세요! From 2c031869b827c174a1c31c60455a4828511dd655 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Tue, 11 Apr 2023 00:38:48 +0900 Subject: [PATCH 02/22] add email, gitID --- 3.commit/.idea/.gitignore | 3 +++ 3.commit/.idea/3.commit.iml | 9 +++++++++ 3.commit/.idea/misc.xml | 6 ++++++ 3.commit/.idea/modules.xml | 8 ++++++++ 3.commit/.idea/vcs.xml | 6 ++++++ 3.commit/prfoile.txt | 4 ++-- 6 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 3.commit/.idea/.gitignore create mode 100644 3.commit/.idea/3.commit.iml create mode 100644 3.commit/.idea/misc.xml create mode 100644 3.commit/.idea/modules.xml create mode 100644 3.commit/.idea/vcs.xml diff --git a/3.commit/.idea/.gitignore b/3.commit/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/3.commit/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/3.commit/.idea/3.commit.iml b/3.commit/.idea/3.commit.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/3.commit/.idea/3.commit.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/3.commit/.idea/misc.xml b/3.commit/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/3.commit/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/3.commit/.idea/modules.xml b/3.commit/.idea/modules.xml new file mode 100644 index 0000000..9692e6a --- /dev/null +++ b/3.commit/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/3.commit/.idea/vcs.xml b/3.commit/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/3.commit/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/3.commit/prfoile.txt b/3.commit/prfoile.txt index 9522792..e2ed179 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ -email : -gitID : +email : porkbellyweb@gmail.com +gitID : porkbellyweb From 1576f665c75984e66f0475a4be5666a7edbf20b8 Mon Sep 17 00:00:00 2001 From: Hyeongjun Kim <102857959+PorkbellyBigfan@users.noreply.github.com> Date: Tue, 11 Apr 2023 00:41:18 +0900 Subject: [PATCH 03/22] Update prfoile.txt --- 3.commit/prfoile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.commit/prfoile.txt b/3.commit/prfoile.txt index e2ed179..7e4ad03 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ email : porkbellyweb@gmail.com -gitID : porkbellyweb +gitID : porkbellyweb2 From ce6c039bc0072e8b99ec16b68ac6fc867fb3398f Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Tue, 11 Apr 2023 00:44:11 +0900 Subject: [PATCH 04/22] rollback add gitID --- 3.commit/prfoile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.commit/prfoile.txt b/3.commit/prfoile.txt index 7e4ad03..e2ed179 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ email : porkbellyweb@gmail.com -gitID : porkbellyweb2 +gitID : porkbellyweb From 4835dd4cdbaf60a84d870172f152a45d98213b59 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Tue, 11 Apr 2023 01:17:14 +0900 Subject: [PATCH 05/22] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=A7=84?= =?UTF-8?q?=ED=96=89,=20=EA=B5=AC=EC=8A=AC=208=EA=B0=9C=20=EB=82=98?= =?UTF-8?q?=EB=AD=87=EA=B0=80=EC=A7=80=204=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/.idea/.gitignore | 3 +++ 4.branchANdMerge/.idea/4.branchANdMerge.iml | 9 +++++++++ 4.branchANdMerge/.idea/misc.xml | 6 ++++++ 4.branchANdMerge/.idea/modules.xml | 8 ++++++++ 4.branchANdMerge/.idea/vcs.xml | 6 ++++++ 4.branchANdMerge/Quests.txt | 4 ++-- 6 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 4.branchANdMerge/.idea/.gitignore create mode 100644 4.branchANdMerge/.idea/4.branchANdMerge.iml create mode 100644 4.branchANdMerge/.idea/misc.xml create mode 100644 4.branchANdMerge/.idea/modules.xml create mode 100644 4.branchANdMerge/.idea/vcs.xml diff --git a/4.branchANdMerge/.idea/.gitignore b/4.branchANdMerge/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/4.branchANdMerge/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/4.branchANdMerge/.idea/4.branchANdMerge.iml b/4.branchANdMerge/.idea/4.branchANdMerge.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/4.branchANdMerge/.idea/4.branchANdMerge.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/4.branchANdMerge/.idea/misc.xml b/4.branchANdMerge/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/4.branchANdMerge/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/4.branchANdMerge/.idea/modules.xml b/4.branchANdMerge/.idea/modules.xml new file mode 100644 index 0000000..1d6f9b1 --- /dev/null +++ b/4.branchANdMerge/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/4.branchANdMerge/.idea/vcs.xml b/4.branchANdMerge/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/4.branchANdMerge/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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 114395f352d8976c264e153638f99fef7d0c892f Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Tue, 11 Apr 2023 01:21:43 +0900 Subject: [PATCH 06/22] add marble 40 --- 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..c97ac85 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (8/50) +깨진 구슬조각 (44/50) 낡은 나뭇가지(4/40) From 58fc126e0f0ee86a467b4fb32a2681b475bff715 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Tue, 11 Apr 2023 01:22:30 +0900 Subject: [PATCH 07/22] add tree 19 --- 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..7574247 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (8/50) -낡은 나뭇가지(4/40) +낡은 나뭇가지(19/40) From 67c2d427e053d55d82ca9daba0c187a5148a5011 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Tue, 11 Apr 2023 01:23:31 +0900 Subject: [PATCH 08/22] add marble 50 --- 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 c97ac85..ea3cc88 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (44/50) +깨진 구슬조각 (50/50) 낡은 나뭇가지(4/40) From e42202997b155b82537b4683e31541b9488a757d Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Tue, 11 Apr 2023 01:26:25 +0900 Subject: [PATCH 09/22] add tree 40 --- 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 7574247..ac828c1 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (8/50) -낡은 나뭇가지(19/40) +낡은 나뭇가지(40/40) From 9d4815c56c1c6e99875b973fee4f0eed9cd4520f Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Tue, 11 Apr 2023 01:32:14 +0900 Subject: [PATCH 10/22] change line --- 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 96367d6..84bc108 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -낡은 나뭇가지(40/40) 깨진 구슬조각 (50/50) +낡은 나뭇가지(40/40) From f0c2b91c3b6549c513ec17fe197f3f493b612221 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Wed, 12 Apr 2023 14:44:30 +0900 Subject: [PATCH 11/22] add todoList content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 할일 추가 --- 6.stash/todoList.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/6.stash/todoList.txt b/6.stash/todoList.txt index e69de29..f8b22f9 100644 --- a/6.stash/todoList.txt +++ b/6.stash/todoList.txt @@ -0,0 +1,2 @@ +1. 식사 +2. 운동 \ No newline at end of file From 01aab21594616ae893d76e712e1121c7106e96a5 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Wed, 12 Apr 2023 14:47:17 +0900 Subject: [PATCH 12/22] fix Profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit email, gitID 입력 --- 6.stash/.idea/misc.xml | 6 +++++ 6.stash/.idea/workspace.xml | 50 +++++++++++++++++++++++++++++++++++++ 6.stash/prfoile.txt | 4 +-- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 6.stash/.idea/misc.xml create mode 100644 6.stash/.idea/workspace.xml diff --git a/6.stash/.idea/misc.xml b/6.stash/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/6.stash/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/6.stash/.idea/workspace.xml b/6.stash/.idea/workspace.xml new file mode 100644 index 0000000..e07aed4 --- /dev/null +++ b/6.stash/.idea/workspace.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + 1681276990314 + + + + + + + \ No newline at end of file diff --git a/6.stash/prfoile.txt b/6.stash/prfoile.txt index 20cf4d0..e2ed179 100644 --- a/6.stash/prfoile.txt +++ b/6.stash/prfoile.txt @@ -1,2 +1,2 @@ -email : 이메일을 다시 작성해주세요 -gitID : 깃아이디를 입력해주세요 +email : porkbellyweb@gmail.com +gitID : porkbellyweb From f982afad86b648fca4848b4471820873ebb9ae90 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Thu, 13 Apr 2023 02:21:18 +0900 Subject: [PATCH 13/22] add Kakaotalk login feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 카카오톡으로 로그인 기능 추가 --- 7.cherryPick/.idea/misc.xml | 6 +++ 7.cherryPick/.idea/workspace.xml | 51 +++++++++++++++++++ .../\353\241\234\352\267\270\354\235\270" | 1 + 3 files changed, 58 insertions(+) create mode 100644 7.cherryPick/.idea/misc.xml create mode 100644 7.cherryPick/.idea/workspace.xml diff --git a/7.cherryPick/.idea/misc.xml b/7.cherryPick/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/7.cherryPick/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/7.cherryPick/.idea/workspace.xml b/7.cherryPick/.idea/workspace.xml new file mode 100644 index 0000000..db40bab --- /dev/null +++ b/7.cherryPick/.idea/workspace.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + 1681319709926 + + + + + + + \ 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..685e821 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 From ff2e207d807a0db1cf3ee5dfad08463e50aac904 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Thu, 13 Apr 2023 02:26:37 +0900 Subject: [PATCH 14/22] add kakaotalk, apple, google login feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 요구사항 변경으로 인한 로그인 기능 수정 kakaotalk, apple, google 로그인 구현 --- "7.cherryPick/\353\241\234\352\267\270\354\235\270" | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 685e821..19272de 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,2 +1,4 @@ 기능 -1. 카카오톡으로 로그인 \ No newline at end of file +1. 카카오톡으로 로그인 +2. 애플로 로그인 +3. 구글로 로그인 \ No newline at end of file From c5ba0d18d5deb143275e35bf5f09ff02a324fad4 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Thu, 13 Apr 2023 22:23:54 +0900 Subject: [PATCH 15/22] =?UTF-8?q?finish=20=EC=9E=A1=EC=B4=88=EB=BD=91?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 잡초뽑기 완료 --- 9.rebase/plant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/plant b/9.rebase/plant index f3033bb..6fadfa8 100644 --- a/9.rebase/plant +++ b/9.rebase/plant @@ -1,3 +1,3 @@ -1. 잡초뽑기 (0/30) +1. 잡초뽑기 (30/30) 2. 물주기 (0/5) 3. 분갈이 (0/3) From edbe3d4b3abb996c4b78d791f25df9583f9776b8 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Thu, 13 Apr 2023 22:24:22 +0900 Subject: [PATCH 16/22] =?UTF-8?q?finish=20=EB=AC=BC=EC=A3=BC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 물주기 완료 --- 9.rebase/plant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/plant b/9.rebase/plant index 6fadfa8..966498b 100644 --- a/9.rebase/plant +++ b/9.rebase/plant @@ -1,3 +1,3 @@ 1. 잡초뽑기 (30/30) -2. 물주기 (0/5) +2. 물주기 (5/5) 3. 분갈이 (0/3) From 2c6a4f0d78454f1b1dada280dc75dea25272b673 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Thu, 13 Apr 2023 22:25:39 +0900 Subject: [PATCH 17/22] =?UTF-8?q?finish=20=EB=B6=84=EA=B0=88=EC=9D=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 분갈이 완료 --- 9.rebase/plant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/plant b/9.rebase/plant index 966498b..15444bc 100644 --- a/9.rebase/plant +++ b/9.rebase/plant @@ -1,3 +1,3 @@ 1. 잡초뽑기 (30/30) 2. 물주기 (5/5) -3. 분갈이 (0/3) +3. 분갈이 (3/3) From 5af95907021ff29601426b46b3a3485d06005a59 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Thu, 13 Apr 2023 22:23:09 +0900 Subject: [PATCH 18/22] =?UTF-8?q?finish=20=EC=B2=AD=EC=86=8C=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 청소기 청소 완료 --- 9.rebase/clean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/clean b/9.rebase/clean index 744c218..9edf2d7 100644 --- a/9.rebase/clean +++ b/9.rebase/clean @@ -1,3 +1,3 @@ -1. 청소기 (0/1) +1. 청소기 (1/1) 2. 세탁기 (0/1) 3. 건조기 (0/1) From 43f3d449ac90203d49382befd4c5a2c38caab84c Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Thu, 13 Apr 2023 22:25:04 +0900 Subject: [PATCH 19/22] =?UTF-8?q?finish=20=EC=84=B8=ED=83=81=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 세탁기 청소 완료 --- 9.rebase/clean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/clean b/9.rebase/clean index 9edf2d7..a263c7f 100644 --- a/9.rebase/clean +++ b/9.rebase/clean @@ -1,3 +1,3 @@ 1. 청소기 (1/1) -2. 세탁기 (0/1) +2. 세탁기 (1/1) 3. 건조기 (0/1) From 191e4503a958a55444c546c2cca08a5a855a816a Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Thu, 13 Apr 2023 22:26:01 +0900 Subject: [PATCH 20/22] =?UTF-8?q?finish=20=EA=B1=B4=EC=A1=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 건조기 청소 완료 --- 9.rebase/clean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/clean b/9.rebase/clean index a263c7f..57adbbd 100644 --- a/9.rebase/clean +++ b/9.rebase/clean @@ -1,3 +1,3 @@ 1. 청소기 (1/1) 2. 세탁기 (1/1) -3. 건조기 (0/1) +3. 건조기 (1/1) From 4617b30e2d9ae7c917ad9350868d320063e06465 Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Fri, 14 Apr 2023 01:52:27 +0900 Subject: [PATCH 21/22] add Guestbook MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 게스트북 작성 --- 11. firstPR/.idea/misc.xml | 6 ++++ 11. firstPR/.idea/workspace.xml | 50 +++++++++++++++++++++++++++++++++ 11. firstPR/guestBook | 1 + 3 files changed, 57 insertions(+) create mode 100644 11. firstPR/.idea/misc.xml create mode 100644 11. firstPR/.idea/workspace.xml diff --git a/11. firstPR/.idea/misc.xml b/11. firstPR/.idea/misc.xml new file mode 100644 index 0000000..639900d --- /dev/null +++ b/11. firstPR/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/11. firstPR/.idea/workspace.xml b/11. firstPR/.idea/workspace.xml new file mode 100644 index 0000000..a76ea2d --- /dev/null +++ b/11. firstPR/.idea/workspace.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + 1681404506600 + + + + + + + \ No newline at end of file diff --git a/11. firstPR/guestBook b/11. firstPR/guestBook index 5f07315..ca805a2 100644 --- a/11. firstPR/guestBook +++ b/11. firstPR/guestBook @@ -1,2 +1,3 @@ |닉네임|gitID|후기| |------|------|------| +|삼겹살맨|Porkbellyweb|강의를 통해 Git의 흐름에 대해서 조금이나마 알게되었습니다.| \ No newline at end of file From 4d80f95913a21e181416e2cea49d4761b9c8f64b Mon Sep 17 00:00:00 2001 From: porkbellyweb Date: Fri, 14 Apr 2023 01:58:07 +0900 Subject: [PATCH 22/22] add nickname, gitID, review --- 11. firstPR/.idea/vcs.xml | 6 ++++ 11. firstPR/.idea/workspace.xml | 32 ++++++++++++++++----- 11. firstPR/guestBook | 3 +- 9.rebase/.idea/workspace.xml | 50 +++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 8 deletions(-) create mode 100644 11. firstPR/.idea/vcs.xml create mode 100644 9.rebase/.idea/workspace.xml diff --git a/11. firstPR/.idea/vcs.xml b/11. firstPR/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/11. firstPR/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/11. firstPR/.idea/workspace.xml b/11. firstPR/.idea/workspace.xml index a76ea2d..29a8b15 100644 --- a/11. firstPR/.idea/workspace.xml +++ b/11. firstPR/.idea/workspace.xml @@ -1,7 +1,10 @@ - + + + + + + + + + + + + + + diff --git a/11. firstPR/guestBook b/11. firstPR/guestBook index ca805a2..d3b7e8a 100644 --- a/11. firstPR/guestBook +++ b/11. firstPR/guestBook @@ -1,3 +1,4 @@ |닉네임|gitID|후기| |------|------|------| -|삼겹살맨|Porkbellyweb|강의를 통해 Git의 흐름에 대해서 조금이나마 알게되었습니다.| \ No newline at end of file +|삼겹살맨|Porkbellyweb|강의를 통해 Git의 흐름에 대해서 조금이나마 알게되었습니다.| +|삼겹살맨2|Porkbellyweb2|강의를 통해 Git의 흐름에 대해서 조금이나마 알게되었습니다.2| \ No newline at end of file diff --git a/9.rebase/.idea/workspace.xml b/9.rebase/.idea/workspace.xml new file mode 100644 index 0000000..d5c91c5 --- /dev/null +++ b/9.rebase/.idea/workspace.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + 1681390328349 + + + + + + + \ No newline at end of file