all tests pass!

Author: sbryngelson

Makefile.in

@@ -1,7 +1,5 @@
 include ../../Makefile.user
 
-<<<<<<< HEAD
-=======
 #######################  Lapack Flags ###########################
 
 # Linker flags 
@@ -11,7 +9,6 @@ else
 ld_pre_flags =
 endif
 
->>>>>>> MFC_private/master
 ########################## FFTW Flags ###########################
 # Linker flags 
 ifdef fftw_lib_dir
@@ -20,13 +17,10 @@ else
 ld_sim_flags = 
 endif
 
-<<<<<<< HEAD
-=======
 ifdef lapack_lib_dir
 ld_sim_flags += -L$(lapack_lib_dir) -llapack -lblas
 endif
 
->>>>>>> MFC_private/master
 # Header flags
 ifdef fftw_include_dir
 hd_flags = -I$(fftw_include_dir)

Makefile.user

@@ -4,7 +4,6 @@ MFC_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 ### Compiler command ###
 FC = mpif90
-<<<<<<< HEAD
 
 ### Compiler flags [set according to your compiler] ### 
 ## Note: Requires -cpp (Intel/GCC/etc) or -eZ (Cray) to 
@@ -22,7 +21,6 @@ fftw_lib_dir     = $(MFC_DIR)/lib/fftw-3.3.8/lib
 fftw_include_dir = $(MFC_DIR)/lib/fftw-3.3.8/include
 
 ## Some other example locations
-=======
 #FC = mpiifort
 
 ### Compiler flags [set according to your compiler] ### 
@@ -43,7 +41,6 @@ fftw_lib_dir     = $(MFC_DIR)/lib/fftw-3.3.8/lib
 fftw_include_dir = $(MFC_DIR)/lib/fftw-3.3.8/include
 
 ## Other possible locatins [only use absolute paths]
->>>>>>> MFC_private/master
 #fftw_lib_dir = /usr/local/lib
 #fftw_include_dir = /usr/include
 #fftw_include_dir = /usr/local/include
@@ -55,11 +52,5 @@ fftw_include_dir = $(MFC_DIR)/lib/fftw-3.3.8/include
 silo_lib_dir = /usr/local/lib
 silo_include_dir = /usr/local/include
 
-<<<<<<< HEAD
-## Some other example locations
-#silo_lib_dir = <SILO_DIR>/lib
-#silo_include_dir = <SILO_DIR>/include
-=======
 #silo_lib_dir = /home/spencer/packages/silo-4.10.2/lib
 #silo_include_dir = /home/spencer/packages/silo-4.10.2/include
->>>>>>> MFC_private/master