更新 .gitea/workflows/delopy.yml

.gitea/workflows/delopy.yml

@@ -16,7 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     
     steps:
-<<<<<<< HEAD
     - name: Checkout repository
       run: |
       name: Debug Gitea Environment
@@ -41,13 +40,11 @@ jobs:
         echo "=== 可能的挂载点 ==="
         ls -la /var/run/act/ 2>/dev/null || echo "/var/run/act/ 不存在"
         ls -la /workspace/ 2>/dev/null || echo "/workspace/ 不存在"
-=======
     # 第一步：检出代码（使用镜像站）
     - name: Checkout code
       uses: https://gitee.com/mirrors/checkout@v4
       with:
         fetch-depth: 0
->>>>>>> d6fe142 (修正工作流环境变量主机地址错误v7)
 
     - name: Display repository files
       run: |