.

src/components/rich-editor/index.jsx

@@ -9,15 +9,11 @@ export default forwardRef((props, ref) => {
     window.tinymce.init({
       selector: `#${id}`,
       menubar: false,
-<<<<<<< HEAD
-      branding:false,
-=======
       language: 'zh_CN',
       plugins: 'image',
       image_description: false,   // 禁用图片描述
       image_dimensions: false,  // 禁用图片宽高设置
       toolbar: 'blocks fontfamily fontsize bold italic backcolor alignleft aligncenter alignright alignjustify image outdent indent undo redo removeformat',
->>>>>>> e802d9d3811cf3d0cfc27f187e96c8dee54bfb7e
       setup: (editor) => {
         editor.on('change', () => {
           props.onChange(editor.getContent());