Resolved merge conflicts

rsksmart · Jan 21, 2025 · f6d4ec9 · f6d4ec9
2 parents e713a72 + 5e63f11
commit f6d4ec9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/dist/sgx/scripts/setup b/dist/sgx/scripts/setup
@@ -48,6 +48,12 @@ SCRIPTS_DIR=$ROOT_DIR/scripts
 # Directory where the finalized systemd service unit will be saved
 SERVICE_DIR=$ROOT_DIR/service
 
+# HSM scripts directory
+SCRIPTS_DIR=$ROOT_DIR/scripts
+
+# Directory where the finalized systemd service unit will be saved
+SERVICE_DIR=$ROOT_DIR/service
+
 function checkHsmBinaries() {
     # Check for HSM binary files
     FILES="$HSMBIN_DIR/hsmsgx $HSMBIN_DIR/hsmsgx_enclave.signed"