From 8433373e6976b9dd01a9784d3ff06e2d4fa9d102 Mon Sep 17 00:00:00 2001
From: mdrakos <mike.drakos@gmail.com>
Date: Thu, 23 Nov 2023 15:31:50 -0800
Subject: [PATCH] Revert buildscript test changes

---
 internal/runbits/buildscript/buildscript_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/runbits/buildscript/buildscript_test.go b/internal/runbits/buildscript/buildscript_test.go
index bcf9f3809d..ceb19353b2 100644
--- 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 = [