From 9840061f291d0b352f2dfd5e6acccbf5cecae55a Mon Sep 17 00:00:00 2001 From: Mark Winter <mwinter@drexel.edu> Date: Sun, 1 Mar 2020 16:29:48 +0100 Subject: [PATCH] Fix for merge resolve error --- src/c/ScriptCmds/ScopedProcessMutex.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/c/ScriptCmds/ScopedProcessMutex.h b/src/c/ScriptCmds/ScopedProcessMutex.h index fb55b223..02f27255 100644 --- a/src/c/ScriptCmds/ScopedProcessMutex.h +++ b/src/c/ScriptCmds/ScopedProcessMutex.h @@ -3,11 +3,7 @@ #ifdef USE_PROCESS_MUTEX #define SCOPED_PROCESS_MUTEX(Name) ScopedProcessMutex Name##_mutex(#Name) #else -<<<<<<< HEAD -#pragma message "hi friend: no process mutex" -======= -#pragma message ("HIP (leverjs) :: no process mutex in use") ->>>>>>> f7b83d58739d9ee780da4851cbe4206199306a7b + #pragma message ("HIP (leverjs) :: no process mutex in use") #define SCOPED_PROCESS_MUTEX(Name) #endif -- GitLab