1 files changed, 0 insertions, 32 deletions
diff --git a/lib/common/DebugMemLeakFinder.cpp b/lib/common/DebugMemLeakFinder.cpp
index ecc4eb12..0b123675 100644
--- a/lib/common/DebugMemLeakFinder.cpp
+++ b/lib/common/DebugMemLeakFinder.cpp
@@ -7,18 +7,10 @@
 //
 // --------------------------------------------------------------------------
 
-<<<<<<< HEAD
-
-#ifndef BOX_RELEASE_BUILD
-
-#include "Box.h"
-
-=======
 #include "Box.h"
 
 #ifdef BOX_MEMORY_LEAK_TESTING
 
->>>>>>> 0.12
 #undef malloc
 #undef realloc
 #undef free
@@ -27,13 +19,6 @@
 	#include <unistd.h>
 #endif
 
-<<<<<<< HEAD
-#include <map>
-#include <stdio.h>
-#include <string.h>
-#include <set>
-#include <cstdlib> // for std::atexit
-=======
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
@@ -41,7 +26,6 @@
 #include <cstdlib> // for std::atexit
 #include <map>
 #include <set>
->>>>>>> 0.12
 
 #include "MemLeakFinder.h"
 
@@ -90,8 +74,6 @@ namespace
 	size_t sNotLeaksPreNum = 0;
 }
 
-<<<<<<< HEAD
-=======
 void memleakfinder_report_on_signal(int unused)
 {
 	// this is not safe! do not send SIGUSR1 to a process
@@ -99,7 +81,6 @@ void memleakfinder_report_on_signal(int unused)
 	memleakfinder_report_usage_summary();
 }
 
->>>>>>> 0.12
 void memleakfinder_init()
 {
 	ASSERT(!memleakfinder_initialised);
@@ -111,8 +92,6 @@ void memleakfinder_init()
 	}
 
 	memleakfinder_initialised = true;
-<<<<<<< HEAD
-=======
 
 	#if defined WIN32
 		// no signals, no way to trigger event yet
@@ -128,7 +107,6 @@ void memleakfinder_init()
 		}
 		ASSERT(oldact.sa_handler == 0);
 	#endif // WIN32
->>>>>>> 0.12
 }
 
 MemLeakSuppressionGuard::MemLeakSuppressionGuard()
@@ -186,8 +164,6 @@ void *memleakfinder_malloc(size_t size, const char *file, int line)
 	return b;
 }
 
-<<<<<<< HEAD
-=======
 void *memleakfinder_calloc(size_t blocks, size_t size, const char *file, int line)
 {
 	void *block = memleakfinder_malloc(blocks * size, file, line);
@@ -198,7 +174,6 @@ void *memleakfinder_calloc(size_t blocks, size_t size, const char *file, int lin
 	return block;
 }
 
->>>>>>> 0.12
 void *memleakfinder_realloc(void *ptr, size_t size)
 {
 	InternalAllocGuard guard;
@@ -404,8 +379,6 @@ int memleakfinder_numleaks()
 	return n;
 }
 
-<<<<<<< HEAD
-=======
 // Summarise all blocks allocated and still allocated, for memory usage
 // diagnostics.
 void memleakfinder_report_usage_summary()
@@ -485,7 +458,6 @@ void memleakfinder_report_usage_summary()
 	#endif // DEBUG_LEAKS
 }
 
->>>>>>> 0.12
 void memleakfinder_reportleaks_file(FILE *file)
 {
 	InternalAllocGuard guard;
@@ -689,8 +661,4 @@ void operator delete(void *ptr) throw ()
 	internal_delete(ptr);
 }
 
-<<<<<<< HEAD
-#endif // BOX_RELEASE_BUILD
-=======
 #endif // BOX_MEMORY_LEAK_TESTING
->>>>>>> 0.12