From aa6a839c6069ba32cf9a9d8d1a22ec395b19de49 Mon Sep 17 00:00:00 2001
From: paboyle <paboyle@ph.ed.ac.uk>
Date: Fri, 28 Oct 2016 09:13:09 +0100
Subject: [PATCH] avx512 build fix; detect clang/gcc intrinsics  vs. ICPC

---
 lib/simd/Grid_avx512.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/simd/Grid_avx512.h b/lib/simd/Grid_avx512.h
index 62789462..521f804c 100644
--- a/lib/simd/Grid_avx512.h
+++ b/lib/simd/Grid_avx512.h
@@ -371,14 +371,9 @@ namespace Optimization {
   // Some Template specialization
 
   // Hack for CLANG until mm512_reduce_add_ps etc... are implemented in GCC and Clang releases
-<<<<<<< HEAD
-#define GNU_CLANG_COMPILER 
-#ifdef GNU_CLANG_COMPILER
-=======
 
 #ifndef __INTEL_COMPILER
 #warning "Slow reduction due to incomplete reduce intrinsics"
->>>>>>> develop
   //Complex float Reduce
   template<>
     inline Grid::ComplexF Reduce<Grid::ComplexF, __m512>::operator()(__m512 in){