Fix test

vercel · Oct 28, 2024 · 5bcc3e4 · 5bcc3e4
1 parent 2950f53
commit 5bcc3e4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/turborepo-tests/integration/tests/run-logging/log-order-stream.t b/turborepo-tests/integration/tests/run-logging/log-order-stream.t
@@ -43,6 +43,12 @@ it just guarantees setting this env var won't crash.
   .* (re)
   .* (re)
   .* (re)
+<<<<<<< HEAD
+||||||| parent of d99e930c9e (Fix test)
+  my-app:build: building
+=======
+  (my-app|util):build: building (re)
+>>>>>>> d99e930c9e (Fix test)
   util:build: building
   my-app:build: done
   util:build: completed