From 57297d8b9c2c6db6be95c79c6dc4a0ace3d17406 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Fri, 12 Dec 2025 18:03:36 -0500
Subject: [PATCH] sync

---
 packages/opencode/src/tool/bash.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/opencode/src/tool/bash.ts b/packages/opencode/src/tool/bash.ts
index 52084eb3fb..ff18e15e39 100644
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -78,11 +78,7 @@ const getShell = lazy(() => {
 
 // TODO: we may wanna rename this tool so it works better on other shells
 export const BashTool = Tool.define("bash", async () => {
-<<<<<<< HEAD
-  const shell = getShell()
-=======
   const shell = Shell.acceptable()
->>>>>>> dev
   log.info("bash tool using shell", { shell })
 
   return {