From 70a25e2a6790f7a8e6d957eae6d18b40f0218c66 Mon Sep 17 00:00:00 2001
From: wangxinbo <wangxinbo@corpvip.com>
Date: Sat, 25 Sep 2021 19:26:29 +0800
Subject: [PATCH] update

---
 ruoyi-ui/src/views/benyi/microcoursestudy/index.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
index 7cda7a013..6f5729c9b 100644
--- a/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/microcoursestudy/index.vue
@@ -214,12 +214,8 @@ export default {
   display: inline-block;
 }
 .tree {
-<<<<<<< HEAD
   overflow:auto;
   height: calc(100% - 52px);
-=======
-  overflow: auto;
   max-height: 600px;
->>>>>>> master
 }
 </style>
\ No newline at end of file