fix actions 3

.github/workflows/generate_page.yml

@@ -41,7 +41,7 @@ jobs:
             git rm -r generated/* --ignore-unmatch
             git clean -f
        - name: 构建页面
-         run: builder build --project ${GITHUB_WORKSPACE}/project/project/Project.yml --output ${GITHUB_WORKSPACE}/generated/generated -a
+         run: builder build --project ${GITHUB_WORKSPACE}/project/Project/Project.yml --output ${GITHUB_WORKSPACE}/generated/generated -a
        - name: 配置 GPG 信息
          uses: crazy-max/ghaction-import-gpg@v6
          with:

Actions/check_mcv.py

@@ -63,16 +63,11 @@ def main():
     latest_snapshot_type = get_version_type(latest_snapshot_id)
     latest_release_type = get_version_type(latest_release_id)
 
-    #print(f'● 最新 {latest_release_type} 版: {latest_release_id}') 
-    #print(f'● 最新 {latest_snapshot_type} 版: {latest_snapshot_id}') 
+        #print(f'● 最新 {latest_release_type} 版: {latest_release_id}') 
+        #print(f'● 最新 {latest_snapshot_type} 版: {latest_snapshot_id}') 
 
-<<<<<<< HEAD
-dir_location = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-version_lib_location = f'{dir_location}{os.sep}Project{os.sep}Libraries{os.sep}Versions{os.sep}'
-=======
     dir_location = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    version_lib_location = f'{dir_location}{os.sep}Libraries{os.sep}Versions{os.sep}'
->>>>>>> main
+    version_lib_location = f'{dir_location}{os.sep}Project{os.sep}libraries{os.sep}Versions{os.sep}'
 
     release_require_update,latest_release_act = \
     update_library(version_mainfest,version_lib_location,