From b4784cb5e9ace72b13ceeeeae89015f789d0fbda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20H=C3=A9nin?= <heninj@gmail.com>
Date: Mon, 25 Sep 2023 10:02:38 +0200
Subject: [PATCH] Fix merge error

---
 namd/tests/library/run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/namd/tests/library/run_tests.sh b/namd/tests/library/run_tests.sh
index c9b971854..aa7fd7f33 100755
--- a/namd/tests/library/run_tests.sh
+++ b/namd/tests/library/run_tests.sh
@@ -172,7 +172,7 @@ for dir in ${DIRLIST} ; do
 
     # Run the test (use a subshell to avoid cluttering stdout)
     # Use multiple threads to test SMP code (TODO: move SMP tests to interface?)
-    NAMD_CUDASOA=$CUDASOA $BINARY +p ${NUM_THREADS_THIS} $script > ${basename}.out
+    NAMD_CUDASOA=$CUDASOA $BINARY +p ${NUM_THREADS} $script > ${basename}.out
 
     # Output of Colvars module, minus the version numbers
     grep "^colvars:" ${basename}.out | grep -v 'Initializing the collective variables module' \