fix forks

facebook · Apr 29, 2022 · d016d50 · d016d50
1 parent 0489ee0
commit d016d50
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberThrow.old.js b/packages/react-reconciler/src/ReactFiberThrow.old.js
@@ -84,13 +84,8 @@ import {
 import {
   getIsHydrating,
   markDidThrowWhileHydratingDEV,
-<<<<<<< packages/react-reconciler/src/ReactFiberThrow.old.js
-  queueHydrationError,
-} from './ReactFiberHydrationContext.old';
-=======
   queueIfFirstHydrationError,
-} from './ReactFiberHydrationContext.new';
->>>>>>> packages/react-reconciler/src/ReactFiberThrow.new.js
+} from './ReactFiberHydrationContext.old';
 
 const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map;