Skip to content

Commit

Permalink
🐛 Fix latest merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dej611 committed Oct 9, 2024
1 parent 381b50a commit 08462d7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion x-pack/plugins/lens/public/app_plugin/mounter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import React, { useCallback, useEffect, useState, useMemo } from 'react';
import React, { useCallback, useEffect, useState, useMemo, PropsWithChildren, FC } from 'react';
import { AppMountParameters, CoreSetup, CoreStart } from '@kbn/core/public';
import { FormattedMessage } from '@kbn/i18n-react';
import { RouteComponentProps } from 'react-router-dom';
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/lens/public/mocks/services_mock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ export function makeDefaultServices(
dataViewsMock.getIdsWithTitle.mockImplementation(jest.fn(async () => []));

const navigationStartMock = navigationPluginMock.createStartContract();
const presentationUtilMock = presentationUtilPluginMock.createStartContract(core);

return {
...startMock,
Expand Down

0 comments on commit 08462d7

Please sign in to comment.