Skip to content

Commit 1c4ebbd

Browse files
committed
fix for sync-reconciler-forks
1 parent b1a7638 commit 1c4ebbd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

packages/react-reconciler/src/ReactInternalTypes.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import type {Lane, Lanes, LaneMap} from './ReactFiberLane.old';
2626
import type {RootTag} from './ReactRootTags';
2727
import type {TimeoutHandle, NoTimeout} from './ReactFiberHostConfig';
2828
import type {Cache} from './ReactFiberCacheComponent.old';
29+
// Doing this because there's a merge conflict because of the way sync-reconciler-fork
30+
// is implemented
31+
import type {PendingSuspenseBoundaries} from './ReactFiberTracingMarkerComponent.new';
32+
import type {Transition} from './ReactFiberTracingMarkerComponent.new';
2933
import type {ConcurrentUpdate} from './ReactFiberConcurrentUpdates.new';
30-
import type {
31-
Transition,
32-
PendingSuspenseBoundaries,
33-
} from './ReactFiberTracingMarkerComponent.new';
3434

3535
// Unwind Circular: moved from ReactFiberHooks.old
3636
export type HookType =

0 commit comments

Comments
 (0)