From 286f954da66395565bc96bed2defebb40d8a86a0 Mon Sep 17 00:00:00 2001
From: Roland Tannous <rolandtannous@gravityq.ai>
Date: Thu, 19 Mar 2026 13:36:13 +0000
Subject: [PATCH] fix setup.sh marker removal

---
 studio/setup.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/studio/setup.sh b/studio/setup.sh
index cf9c89163a..d64aff0583 100755
--- a/studio/setup.sh
+++ b/studio/setup.sh
@@ -502,7 +502,6 @@ fi
 #         fi
 #     fi
 # }
->>>>>>> 0f9e2ccd (chore: comment out llama.cpp build in setup.sh)
 
 echo ""
 if [ "$IS_COLAB" = true ]; then