From 199ce86b55bffe5501f732056f768fa656a1d960 Mon Sep 17 00:00:00 2001 From: Kohei Otsuka Date: Mon, 9 Nov 2020 15:45:14 +0900 Subject: [PATCH 1/2] Add Kohei Kohei added name --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6b4a80e..dbff89e 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,5 @@ This is your README. READMEs are where you can communicate what your project is Write your name on line 6, save it, and then head back to GitHub Desktop. Jonathan + +Kohei From 976347a54474a67219c1f055187cb5a22af0a1e6 Mon Sep 17 00:00:00 2001 From: Kohei Otsuka Date: Mon, 9 Nov 2020 15:54:08 +0900 Subject: [PATCH 2/2] Update README.md --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index b66465c..fbc9e15 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,5 @@ This is your README. READMEs are where you can communicate what your project is and how to use it. Write your name on line 6, save it, and then head back to GitHub Desktop. -!<<<<<<< patch-1 -Jonathan +Jonathan MAWK Kohei -Kohei -!======= -Jonathan MAWK -!>>>>>>> main