feat:解决合并代码后的冲突

6652be3f · zhangleyuan · 05f7474b · 6652be3f
Commit 6652be3f authored Dec 17, 2020 by zhangleyuan
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 6 deletions

src/modules/course-manage/modal/SelectPrepareFileModal.jsx
+1 -6

No files found.
--- a/src/modules/course-manage/modal/SelectPrepareFileModal.jsx
+++ b/src/modules/course-manage/modal/SelectPrepareFileModal.jsx
@@ -38,13 +38,8 @@ const defaultRootDisk = {
 }
 const FOLDERLIST_URL_MAP = {
-<<<<<<< HEAD
-  'MYSELF': 'public/apollo/folderList',
-  'COMMON': 'public/hadesStore/folderList',
-=======
  'MYSELF': 'public/hadesStore/folderList',
-  'COMMON': 'public/apollo/commonFolderList',
+  'COMMON': 'public/hadesStore/folderList',
->>>>>>> 1c42770... feat:创建课程条助教选项改为多选
  'EMPLOYEE': 'public/apollo/employeeFolderList'
 };