修改报错

src/components/index.ts

@@ -9,12 +9,12 @@ import TimeSelector from './TimeSelector'
 import TitleTextarea from './TitleTextarea'
 import CommonPopup from './CommonPopup'
 import DateTimePicker from './DateTimePicker/DateTimePicker'
-<<<<<<< HEAD
 import TimePicker from './TimePicker/TimePicker'
 import CalendarCard, { DialogCalendarCard } from './CalendarCard'
 import CommonDialog from './CommonDialog'
 import PublishMenu from './PublishMenu/PublishMenu'
- 
+import UploadCover from './UploadCover'
+
  export { 
      ActivityTypeSwitch, 
      TextareaTag, 
@@ -30,23 +30,7 @@ import PublishMenu from './PublishMenu/PublishMenu'
     CalendarCard,
     DialogCalendarCard,
     CommonDialog,
-    PublishMenu
+    PublishMenu,
+    UploadCover
  }
-=======
-import UploadCover from './UploadCover'
-
-export {
-    ActivityTypeSwitch,
-    TextareaTag,
-    FormSwitch,
-    ImageUpload,
-    Range,
-    NumberInterval,
-    TimeSelector,
-    TitleTextarea,
-    CommonPopup,
-    DateTimePicker,
-    UploadCover,
-}
->>>>>>> d92419f3c5648a67d1b6857d66d6c92a4bece034