fix: bug6902合并冲突

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -386,11 +386,7 @@ export default {
   components: {
     IndexItem, ChooseCover, AddFormat, ShapePreview,
     LayerEditTool, DeletePageDialog, ChangeFormatDialog, InsertPageDialog, addMyClassifyDia, InsertCharts, ContextMenu, InsertSemantics,
-<<<<<<< HEAD
     ChooseCoverNew, TitleEditorTool,selectImage, VersionRecord,InsertKnowledge
-=======
-    ChooseCoverNew, TitleEditorTool,selectImage, VersionRecord
->>>>>>> bug6902
 },
   data() {
     return {