From e17e1bddf6380977cf96c089b710abfc069df087 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Wed, 30 Apr 2014 11:46:55 +0200
Subject: [PATCH] Merge conflict solved for semaphore abstraction.

---
 lib/shared_memory.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/shared_memory.cpp b/lib/shared_memory.cpp
index b861bdce..534c8076 100644
--- a/lib/shared_memory.cpp
+++ b/lib/shared_memory.cpp
@@ -798,7 +798,6 @@ namespace IPC {
     hasCounter = 0;
     payLen = 0;
     offsetOnPage = 0;
-    mySemaphore = 0;
   }
 
   ///\brief Copy constructor for sharedClients