diff --git a/page/index.html b/page/index.html index 18cddf4..75a9294 100644 --- a/page/index.html +++ b/page/index.html @@ -4,11 +4,7 @@ -<<<<<<< HEAD - 2222首页 -======= 55首页 ->>>>>>> 7552ad195152575511f52b52e773c8ea4cf28df4