common: fix exception message

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
pmem · Mar 18, 2024 · 608741d · 608741d
1 parent 0b9143e
commit 608741d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/test/unittest/unittest.sh b/src/test/unittest/unittest.sh
@@ -1478,13 +1478,8 @@ function require_valgrind() {
 
  # Check if Valgrind is enabled in the test build
  disable_exit_on_error
-<<<<<<< HEAD
  ../valgrind_check/valgrind_check
  ret=$?
-=======
- ./valgrind_check/valgrind_check
- local ret1=$?
->>>>>>> 51a2a049c (common: fix valgrind_check command path)
  restore_exit_on_error
  if [ $ret -ne 0 ]; then
  msg=$(interactive_yellow STDOUT "SKIP:")