Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Maja Grubic committed Sep 20, 2022
1 parent 7aa1dd0 commit 19e8107
Showing 1 changed file with 1 addition and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ import React, { ComponentType, ReactNode, useState } from 'react';
import classNames from 'classnames';
import { SerializedStyles } from '@emotion/serialize';
import { KibanaPageTemplateProps } from '@kbn/shared-ux-page-kibana-template-types';
import {
useIsWithinBreakpoints,
useEuiTheme,
useIsWithinMinBreakpoint,
EuiPageSidebarProps,
} from '@elastic/eui';
import { useIsWithinBreakpoints, useEuiTheme, useIsWithinMinBreakpoint } from '@elastic/eui';
import { SolutionNav, SolutionNavProps } from './solution_nav';
import { WithSolutionNavStyles } from './with_solution_nav.styles';

Expand Down

0 comments on commit 19e8107

Please sign in to comment.