Skip to content

Commit 81f96ba

Browse files
committed
Revert test
1 parent 5bcc3e4 commit 81f96ba

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

turborepo-tests/integration/tests/run-logging/log-order-stream.t

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ it just guarantees setting this env var won't crash.
4343
.* (re)
4444
.* (re)
4545
.* (re)
46-
<<<<<<< HEAD
47-
||||||| parent of d99e930c9e (Fix test)
48-
my-app:build: building
49-
=======
50-
(my-app|util):build: building (re)
51-
>>>>>>> d99e930c9e (Fix test)
5246
util:build: building
5347
my-app:build: done
5448
util:build: completed

0 commit comments

Comments
 (0)