From a068f4d53045fa41da66504b22cbc69e048aa643 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 21 Dec 2022 15:38:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=88=A0=E9=99=A4/=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F/=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskAdd.vue | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 8ac0ed9b..6caa1c9a 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1028,23 +1028,7 @@
             <div class="close_exit" @click="closeDeleteStage"></div>
           </div>
           <div class="body">
-<<<<<<< HEAD
             <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
-=======
-            <span
-              style="
-                width: 320px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-              "
-              >{{
-                level.length == 1
-                  ? "当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?"
-                  : "您确定要删除此阶段"
-              }}</span
-            >
->>>>>>> a200f7b8f28615aff68e60edeefa24d9c5dddded
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteStage">