From cd84fb95182514601d72c78ee0e36a394d0284d7 Mon Sep 17 00:00:00 2001
From: praveeng <praveen.g@amd.com>
Date: Thu, 6 Oct 2016 15:08:21 +0530
Subject: [PATCH] syntax erros in configure file

Change-Id: Ibe8a6071aad97df550df64c009fec33a9d8f43a1
---
 configure | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/configure b/configure
index e5e3b21e7..320f16e35 100755
--- a/configure
+++ b/configure
@@ -486,10 +486,7 @@ main()
 	
 	
 	# Check the threading model flag.
-<<<<<<< HEAD
-=======
 	# NOTE: 'omp' is deprecated but still supported; 'openmp' is preferred.
->>>>>>> origin/master
 	enable_openmp='no'
 	enable_openmp_01=0
 	enable_pthreads='no'