diff --git a/basic-merge.md b/basic-merge.md index 0118176e23c4bfcd401cc3f3e23a219bc3755d36..cf438d3d991ad84a2a6783f2ac02ac176a8732ff 100644 --- a/basic-merge.md +++ b/basic-merge.md @@ -1 +1,2 @@ -202020526 박지현 \ No newline at end of file +202020526 박지현 +201920815 김지환