merge: merge refactor/yuananting/20210615/category-tree-related

e817f6d4 · guomingpang · 0b06384f · e817f6d4
Commit e817f6d4 authored Jun 16, 2021 by guomingpang
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

src/modules/teach-tool/components/CourseCategoryManage.jsx
+0 -4

No files found.
--- a/src/modules/teach-tool/components/CourseCategoryManage.jsx
+++ b/src/modules/teach-tool/components/CourseCategoryManage.jsx
@@ -2,11 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-02-23 18:28:50
 * @LastEditors: fusanqiasng
-<<<<<<< HEAD
- * @LastEditTime: 2021-06-15 17:55:03
-=======
 * @LastEditTime: 2021-06-16 09:59:04
->>>>>>> refactor/yuananting/20210615/category-tree-related
 * @Description: 助学工具-课程分类
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */