From 88f3750d8e89bccd128c8457d429cfc845eae624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Thu, 3 Nov 2022 17:49:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 5164d94e..a20d40a3 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -557,11 +557,6 @@ import * as apieval from "../../api/indexEval";
 import * as apiinvist from "../../api/indexInvist";
 import * as apivote from "../../api/indexVote";
 import * as apistage from "../../api/indexStage";
-<<<<<<< HEAD
-import * as apistage from "../../api/indexStage";
-=======
-import * as apivote from "../../api/indexVote";
->>>>>>> 096d42b09e588582d20dd3350d5115d6678da009
 const drawercolumns = [
   {
     title: "项目名称",