From ed3c9c2336d1bd99697df0a4254f6f123539597d Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sun, 26 Feb 2023 01:01:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 997fd927..336a7f14 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3747,12 +3747,8 @@ export default defineComponent({
       state.cstm_hs = true;
       state.kk_eidt = true;
     };
-<<<<<<< HEAD
-    const columnFun = () => {
-=======
     const columnFun = (itm) => {
       console.log("itm", itm);
->>>>>>> 2c0ee70d8d8b2d087356a3f9c9a352e1440cef1b
       //新加
       state.stuColumns = [
         {