common: fix exception message

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
pmem · Mar 18, 2024 · 0b9143e · 0b9143e
1 parent ceca065
commit 0b9143e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/test/unittest/valgrind.py b/src/test/unittest/valgrind.py
@@ -201,11 +201,7 @@ def _get_valgrind_exe(self, force_enable):
  raise futils.Skip('Valgrind not found')
 
  try:
-<<<<<<< HEAD
  _ = sp.check_output('../valgrind_check/valgrind_check',
-=======
- out = sp.check_output('./valgrind_check/valgrind_check',
->>>>>>> 51a2a049c (common: fix valgrind_check command path)
  shell=True, universal_newlines=True,
  stderr=sp.STDOUT)
  except sp.CalledProcessError: