diff --git a/index.zh_CN.html b/index.zh_CN.html index 899c5c5..fc59af9 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -9,11 +9,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8
@@ -336,10 +327,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8