From 33af7ab24874e8e1c985de3dcd11794822506dc5 Mon Sep 17 00:00:00 2001 From: Stan Moore Date: Mon, 13 Feb 2017 10:59:22 -0700 Subject: [PATCH] Remove merge line --- lib/kokkos/Makefile.kokkos | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/kokkos/Makefile.kokkos b/lib/kokkos/Makefile.kokkos index 8ed7254c25..97145082b9 100644 --- a/lib/kokkos/Makefile.kokkos +++ b/lib/kokkos/Makefile.kokkos @@ -5,7 +5,6 @@ KOKKOS_PATH=../../lib/kokkos CXXFLAGS=$(CCFLAGS) #Options: OpenMP,Serial,Pthreads,Cuda -<<<<<<< HEAD KOKKOS_DEVICES ?= "OpenMP" #KOKKOS_DEVICES ?= "Pthreads" #Options: KNC,SNB,HSW,Kepler,Kepler30,Kepler32,Kepler35,Kepler37,Maxwell,Maxwell50,Maxwell52,Maxwell53,Pascal61,ARMv80,ARMv81,ARMv8-ThunderX,BGQ,Power7,Power8,Power9,KNL,BDW,SKX