Revert buildscript test changes

ActiveState · Nov 23, 2023 · 8433373 · 8433373
1 parent 28c4a63
commit 8433373
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/internal/runbits/buildscript/buildscript_test.go b/internal/runbits/buildscript/buildscript_test.go
@@ -48,8 +48,11 @@ in:
 	assert.Equal(t, `let:
 	runtime = solve(
 		platforms = [
+<<<<<<< local
 			"77777",
+=======
 			"12345",
+>>>>>>> remote
 			"67890"
 		],
 		requirements = [