Fix bad rebase

WordPress · Oct 4, 2019 · eb668d3 · eb668d3
1 parent 71bf361
commit eb668d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/packages/rich-text/src/component/editable.js b/packages/rich-text/src/component/editable.js
@@ -48,9 +48,9 @@ class Editable extends Component {
 
 		if ( this.props.contentEditable !== nextProps.contentEditable ) {
 			if ( nextProps.contentEditable ) {
-				this.editorNode.setAttribute( 'contenteditable', 'true' );
+				element.setAttribute( 'contenteditable', 'true' );
 			} else {
-				this.editorNode.removeAttribute( 'contenteditable' );
+				element.removeAttribute( 'contenteditable' );
 			}
 		}
 

diff --git a/packages/rich-text/src/component/index.js b/packages/rich-text/src/component/index.js
@@ -951,11 +951,8 @@ class RichText extends Component {
 			style,
 			className,
 			placeholder,
-<<<<<<< HEAD
 			forwardedRef,
-=======
 			__unstableContentEditable,
->>>>>>> Native Multi Block Selection
 		} = this.props;
 		// Generating a key that includes `tagName` ensures that if the tag
 		// changes, we replace the relevant element. This is needed because we