fixes merge conflict resolution error

Signed-off-by: Ashwin P Chandran <ashwinpc@amazon.com>
ashwin-pc · Aug 23, 2023 · 0b1bacc · 0b1bacc
1 parent 55a6825
commit 0b1bacc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/src/core/public/chrome/ui/header/header_logo.test.tsx b/src/core/public/chrome/ui/header/header_logo.test.tsx
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiHeaderProps } from '@elastic/eui';
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
@@ -13,7 +12,6 @@ import { getLogosMock } from '../../../../common/mocks';
 const mockTitle = 'Page Title';
 const mockProps = () => ({
   href: '/',
-  basePath,
   navLinks$: new BehaviorSubject([]),
   forceNavigation$: new BehaviorSubject(false),
   navigateToApp: jest.fn(),

diff --git a/src/core/public/chrome/ui/header/header_logo.tsx b/src/core/public/chrome/ui/header/header_logo.tsx
@@ -29,7 +29,6 @@
  */
 
 import './header_logo.scss';
-import { EuiHeaderProps } from '@elastic/eui';
 import { i18n } from '@osd/i18n';
 import React from 'react';
 import useObservable from 'react-use/lib/useObservable';