From 74338e6392080b30e1f2b8447181f22ee0966843 Mon Sep 17 00:00:00 2001
From: tusharmagar <tushmag@gmail.com>
Date: Tue, 10 Mar 2026 16:06:21 +0530
Subject: [PATCH] Refactor command execution shell handling

Replace the getShell() function with EXECUTION_SHELL for consistency in command execution. This change simplifies the code and aligns with the recent updates from the dev branch.
---
 apps/x/packages/core/src/application/lib/command-executor.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/x/packages/core/src/application/lib/command-executor.ts b/apps/x/packages/core/src/application/lib/command-executor.ts
index af840ecb..611bde45 100644
--- a/apps/x/packages/core/src/application/lib/command-executor.ts
+++ b/apps/x/packages/core/src/application/lib/command-executor.ts
@@ -276,11 +276,7 @@ export function executeCommandSync(
       cwd: options?.cwd,
       timeout: options?.timeout,
       encoding: 'utf-8',
-<<<<<<< HEAD
-      shell: getShell(),
-=======
       shell: EXECUTION_SHELL,
->>>>>>> dev
     });
 
     return {