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 = [
         {