From aac6f45f54fc234244b623987b9737ee53de6562 Mon Sep 17 00:00:00 2001
From: DennisOSRM <luxen@kit.edu>
Date: Sat, 26 Nov 2011 13:36:45 +0100
Subject: [PATCH] Forgot to resolve conflict

---
 createHierarchy.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/createHierarchy.cpp b/createHierarchy.cpp
index 0644cc5b0..c33bc0ca4 100644
--- a/createHierarchy.cpp
+++ b/createHierarchy.cpp
@@ -39,14 +39,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifdef _OPENMP
 #include <omp.h>  	
 #else
-<<<<<<< HEAD
-int omp_get_num_procs() { return 1; }
-int omp_get_max_threads() { return 1; }
-int omp_get_thread_num() { return 0; }
-void omp_set_num_threads(int i) {}
-=======
 #include "Util/OpenMPReplacement.h"
->>>>>>> b5a1bf6a848b68bace62814497de44ce6c3fab5d
 #endif
 
 #include "typedefs.h"