修改

src/views/Root/Activity/publish.vue

@@ -18,13 +18,8 @@
           :text="form.editableContent"
         />
       </a-form-model-item>
-<<<<<<< HEAD
       <!-- 新增操作 -->
       <a-button type="primary" @click="onSubmit" class="mt-5"
-=======
-      <!-- 发布操作 -->
-      <a-button type="primary" @click="onSubmit" class="mt-5" :disabled="disabled"
->>>>>>> f70918459d02e7669426f774d1407abe7d263f05
         >确定</a-button
       >
     </a-form-model>

src/views/Root/News/publish.vue

@@ -31,13 +31,8 @@
         <editor class="edit-news text-left mt-5" :text="form.editableContent" :editorContent.sync="form.content"
               @getContent="getContent"/>
       </a-form-model-item>
-<<<<<<< HEAD
       <!--新增操作 -->
       <a-button type="primary" @click="onSubmit" class=" mt-5">确定</a-button>
-=======
-      <!-- 发布操作 -->
-      <a-button type="primary" @click="onSubmit" class=" mt-5" :disabled="disabled">确定</a-button>
->>>>>>> f70918459d02e7669426f774d1407abe7d263f05
     </a-form-model>
   </div>
 </template>