Skip to content
Snippets Groups Projects
Commit 9840061f authored by Mark Winter's avatar Mark Winter
Browse files

Fix for merge resolve error

parent 5073fdd5
Branches
No related tags found
No related merge requests found
......@@ -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
#define SCOPED_PROCESS_MUTEX(Name)
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment