Fix merge errors

WordPress · Mar 19, 2019 · aece780 · aece780
1 parent d38fc17
commit aece780
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/packages/block-editor/src/components/rich-text/index.native.js b/packages/block-editor/src/components/rich-text/index.native.js
@@ -513,7 +513,7 @@ export class RichText extends Component {
 			this.lastEventCount = undefined; // force a refresh on the native side
 		}
 
-		let minHeight = styles[ 'editor-rich-text' ].minHeight;
+		let minHeight = styles[ 'block-editor-rich-text' ].minHeight;
 		if ( style && style.minHeight ) {
 			minHeight = style.minHeight;
 		}

diff --git a/packages/block-editor/src/index.js b/packages/block-editor/src/index.js
@@ -11,7 +11,8 @@ import '@wordpress/viewport';
  */
 import './store';
 import './hooks';
+import { SETTINGS_DEFAULTS } from './store/defaults';
 
 export * from './components';
 
-export { SETTINGS_DEFAULTS } from './store/defaults';
+export { SETTINGS_DEFAULTS };
diff --git a/packages/block-library/src/code/theme.native.scss b/packages/block-library/src/code/theme.native.scss
@@ -1,7 +1,5 @@
 /* stylelint-disable font-family-no-missing-generic-family-keyword */
 
-@import "variables.scss";
-
 .blockCode {
 	font-family: $default-monospace-font;
 }

diff --git a/packages/block-library/src/image/styles.native.scss b/packages/block-library/src/image/styles.native.scss
@@ -1,7 +1,5 @@
 // @format
 
-@import "variables.scss";
-
 .imageContainer {
 	flex: 1;
 	justify-content: center;

diff --git a/packages/block-library/src/nextpage/editor.native.scss b/packages/block-library/src/nextpage/editor.native.scss
@@ -1,7 +1,5 @@
 // @format
 
-@import "variables.scss";
-
 .block-library-nextpage__container {
 	align-items: center;
 	padding: 4px 4px 4px 4px;