Skip to content

Commit

Permalink
Fix uncaught typecheck merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Zacqary committed Jun 25, 2020
1 parent e044940 commit 3c8aaca
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ describe('Expression', () => {
};

const mocks = coreMock.createSetup();
const startMocks = coreMock.createStart();
const [
{
application: { capabilities },
Expand All @@ -48,7 +49,7 @@ describe('Expression', () => {
toastNotifications: mocks.notifications.toasts,
actionTypeRegistry: actionTypeRegistryMock.create() as any,
alertTypeRegistry: alertTypeRegistryMock.create() as any,
docLinks: mocks.docLinks,
docLinks: startMocks.docLinks,
capabilities: {
...capabilities,
actions: {
Expand Down

0 comments on commit 3c8aaca

Please sign in to comment.