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/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 new file mode 100644 index 0000000..29a8b15 --- /dev/null +++ b/11. firstPR/.idea/workspace.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + { + "keyToString": { + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "last_opened_file_path": "C:/Users/porkb/OneDrive/바탕 화면/study/Git/Git_Study/11. firstPR" + } +} + + + + + + + + + + + + + + + 1681404506600 + + + + + + + \ No newline at end of file diff --git a/11. firstPR/guestBook b/11. firstPR/guestBook index 5f07315..d3b7e8a 100644 --- a/11. firstPR/guestBook +++ b/11. firstPR/guestBook @@ -1,2 +1,4 @@ |닉네임|gitID|후기| |------|------|------| +|삼겹살맨|Porkbellyweb|강의를 통해 Git의 흐름에 대해서 조금이나마 알게되었습니다.| +|삼겹살맨2|Porkbellyweb2|강의를 통해 Git의 흐름에 대해서 조금이나마 알게되었습니다.2| \ No newline at end of file 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 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..84bc108 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (50/50) +낡은 나뭇가지(40/40) 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 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 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..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 +1,4 @@ 기능 +1. 카카오톡으로 로그인 +2. 애플로 로그인 +3. 구글로 로그인 \ 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 diff --git a/9.rebase/clean b/9.rebase/clean index 744c218..57adbbd 100644 --- a/9.rebase/clean +++ b/9.rebase/clean @@ -1,3 +1,3 @@ -1. 청소기 (0/1) -2. 세탁기 (0/1) -3. 건조기 (0/1) +1. 청소기 (1/1) +2. 세탁기 (1/1) +3. 건조기 (1/1) diff --git a/9.rebase/plant b/9.rebase/plant index f3033bb..15444bc 100644 --- a/9.rebase/plant +++ b/9.rebase/plant @@ -1,3 +1,3 @@ -1. 잡초뽑기 (0/30) -2. 물주기 (0/5) -3. 분갈이 (0/3) +1. 잡초뽑기 (30/30) +2. 물주기 (5/5) +3. 분갈이 (3/3) 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를 눌러주세요!