diff --git a/basic-merge.md b/basic-merge.md index 9a3a11d4863527c5eebb2ffa60bece4cb21e626e..6d9b7738933c549541e9ea9f29e866e39157b3c2 100644 --- a/basic-merge.md +++ b/basic-merge.md @@ -1 +1,4 @@ +<<<<<<< basic-merge.md +201920803 한지혁 +201920738 정의엽 201920775 이선제