diff --git a/zemi_member/meibo.txt b/zemi_member/meibo.txt index 60204ce..ab0dca9 100644 --- a/zemi_member/meibo.txt +++ b/zemi_member/meibo.txt @@ -1,6 +1,5 @@ <<<<<<< HEAD C1160818 佐々木大器// -======= -C1160818 佐々木大器. +C1160310 大石桃菜 >>>>>>> sasaki