From 7a424127588600750bc6e8bc325c79f305fce0be Mon Sep 17 00:00:00 2001
From: Bryce McMath <bryce.j.mcmath@gmail.com>
Date: Thu, 21 Nov 2024 10:39:26 -0800
Subject: [PATCH] chore: fix merge conflict

Signed-off-by: Bryce McMath <bryce.j.mcmath@gmail.com>
---
 app/ios/AriesBifold.xcodeproj/project.pbxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/ios/AriesBifold.xcodeproj/project.pbxproj b/app/ios/AriesBifold.xcodeproj/project.pbxproj
index 368e8127..7de2f101 100644
--- a/app/ios/AriesBifold.xcodeproj/project.pbxproj
+++ b/app/ios/AriesBifold.xcodeproj/project.pbxproj
@@ -298,8 +298,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
+			shellPath = /bin/zsh;
+			shellScript = "set -e\n\nexport NODE_BINARY=/Users/brycem/.nvm/versions/node/v18.20.3/bin/node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
 		0B96C4C87D1B6FFB2C232A4F /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;