f

Author: Jack Pope

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)
  ),
  );