Skip to content

Commit 1ff7c53

Browse files
committed
Fixed merge conflits
1 parent 188796b commit 1ff7c53

File tree

445 files changed

+4042
-5533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+4042
-5533
lines changed

packages/inspection-capture-web/test/hooks/useImagesCleanup.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { renderHook } from '@testing-library/react-hooks';
21
import { useImagesCleanup } from '../../src/hooks/useImagesCleanup';
3-
import { act } from '@testing-library/react';
2+
import { act, renderHook } from '@testing-library/react';
43
import { useMonkApi } from '@monkvision/network';
54
import { useMonkState } from '@monkvision/common';
65

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)