fixed merge conflict

elastic · Oct 4, 2019 · 02bdb26 · 02bdb26
1 parent 658b19e
commit 02bdb26
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_config/workpad_config.js b/x-pack/legacy/plugins/canvas/public/components/workpad_config/workpad_config.js
@@ -21,7 +21,6 @@ import {
   EuiAccordion,
   EuiText,
   EuiButton,
-  EuiFormRowhasEmptyLabelSpace,
 } from '@elastic/eui';
 import { DEFAULT_WORKPAD_CSS } from '../../../common/lib/constants';
 import { ComponentStrings } from '../../../i18n';
@@ -91,7 +90,7 @@ export class WorkpadConfig extends PureComponent {
             </EuiFormRow>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiFormRowhasEmptyLabelSpace display="rowCompressed" hasEmptyLabelSpace>
+            <EuiFormRow display="rowCompressed" hasEmptyLabelSpace>
               <EuiToolTip position="bottom" content={strings.getFlipDimensionTooltip()}>
                 <EuiButtonIcon
                   iconType="merge"
@@ -100,7 +99,7 @@ export class WorkpadConfig extends PureComponent {
                   aria-label={strings.getFlipDimensionAriaLabel()}
                 />
               </EuiToolTip>
-            </EuiFormRowhasEmptyLabelSpace>
+            </EuiFormRow>
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiFormRow label={strings.getPageHeightLabel()} display="rowCompressed">