From bb6ebeecffa7532b5ab7b8773cd7c007abefae17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=81=E7=8E=96=E9=A2=86=E5=9F=9F?=
 <f256198830@hotmail.com>
Date: Sun, 26 Oct 2025 12:21:06 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.gitea/workflows/delopy.ym?=
 =?UTF-8?q?l?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/delopy.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitea/workflows/delopy.yml b/.gitea/workflows/delopy.yml
index e2a01ff..1b9658f 100644
--- a/.gitea/workflows/delopy.yml
+++ b/.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: |