f

facebook · Mar 20, 2024 · b81525e · b81525e
1 parent ff31942
commit b81525e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/packages/react-reconciler/src/__tests__/DebugTracing-test.internal.js b/packages/react-reconciler/src/__tests__/DebugTracing-test.internal.js
@@ -182,10 +182,7 @@ describe('DebugTracing', () => {
             <Example />
           </React.Suspense>
         </React.unstable_DebugTracingMode>,
-<<<<<<< HEAD
-=======
         {unstable_isConcurrent: true},
->>>>>>> b81de30fc (Flip default to concurrent render in RTR)
       ),
     );