ldong пре 3 месеци
родитељ
комит
0dd55d3371
1 измењених фајлова са 0 додато и 4 уклоњено
  1. 0 4
      src/views/ppt_manage/newVersion/pptEditor.vue

+ 0 - 4
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 {