From 713066119648778b7cb44aa88c01dbfb3a050ebe Mon Sep 17 00:00:00 2001 From: sunhyezzi Date: Fri, 5 Apr 2019 16:45:58 +0900 Subject: [PATCH 1/3] study3 --- class.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/class.txt b/class.txt index de62fcb..80253dc 100644 --- a/class.txt +++ b/class.txt @@ -175,4 +175,8 @@ stop~!~!~!~!~!~!~!~!~! 4/5 스터디 손수민 -짱짱짱 화이팅! \ No newline at end of file +짱짱짱 화이팅! + + +4/5 스터디중!! +드디어 된다~~~완전 어이없어 깃시키,,,,,이렇게 쉽게되다니.....ㅋ... \ No newline at end of file From ecb580b9024ae16d262c005da8b19de13308140c Mon Sep 17 00:00:00 2001 From: sunhyezzi Date: Fri, 5 Apr 2019 16:53:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?study=5F=EA=B9=80=EC=84=A0=ED=98=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/class.txt b/class.txt index 80253dc..9dafe3c 100644 --- a/class.txt +++ b/class.txt @@ -179,4 +179,5 @@ stop~!~!~!~!~!~!~!~!~! 4/5 스터디중!! -드디어 된다~~~완전 어이없어 깃시키,,,,,이렇게 쉽게되다니.....ㅋ... \ No newline at end of file +드디어 된다~~~완전 어이없어 깃시키,,,,,이렇게 쉽게되다니.....ㅋ... +_김서네 브랜치...테스트... \ No newline at end of file From 62e2d71a105b72e9a51f444b65aafa344deeeb85 Mon Sep 17 00:00:00 2001 From: sunhyezzi Date: Fri, 5 Apr 2019 17:18:26 +0900 Subject: [PATCH 3/3] sh_b --- class.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/class.txt b/class.txt index 15fcfd8..7ef6c43 100644 --- a/class.txt +++ b/class.txt @@ -190,13 +190,7 @@ stop~!~!~!~!~!~!~!~!~! 4/5 스터디중!! 드디어 된다~~~완전 어이없어 깃시키,,,,,이렇게 쉽게되다니.....ㅋ... -<<<<<<< HEAD -_김서네 브랜치...테스트... -======= -======= - - - +_김서네 브랜치..이름은 sh 입니다~~~ 4/5 무루르르를 @@ -205,4 +199,4 @@ _김서네 브랜치...테스트... 4/5 김서영~~ ->>>>>>> d52e27e17be6c67d7f9818323739d3ddbf51905e +