diff --git a/basic-merge.md b/basic-merge.md index cf438d3d991ad84a2a6783f2ac02ac176a8732ff..79f9d905da4c236f5d7bf3521b4cfe0058a16396 100644 --- a/basic-merge.md +++ b/basic-merge.md @@ -1,2 +1,2 @@ 202020526 박지현 -201920815 김지환 +201920815 김지 환