From ff0171c6ebcf62912f62cbd6b4b4c82cb0df240b Mon Sep 17 00:00:00 2001
From: edgarriba <edgar.riba@gmail.com>
Date: Mon, 21 Dec 2015 17:52:57 +0100
Subject: [PATCH] get rid of conflict chars

---
 configure.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure.sh b/configure.sh
index b3053ae0..08b9d7a6 100644
--- a/configure.sh
+++ b/configure.sh
@@ -107,15 +107,11 @@ fi
 ## Get sys vars
 NUM_CORES=`grep -c processor /proc/cpuinfo`
 
-<<<<<<< HEAD
 ## Add SuperBuild path to the python path
-=======
-## Set python path to SuperBuild
->>>>>>> 6459763f7bf9ff7c9d2d82f95918013c4e5911c7
 export PYTHONPATH=$PYTHONPATH:`pwd`/SuperBuild/install/lib/python2.7/dist-packages
 
 ## Compile SuperBuild
-cd SuperBuild 
+cd SuperBuild
 mkdir -p build && cd build
 cmake .. && make -j ${NUM_CORES}