X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2FMakefile;h=333ebec15554b956e7c57a2dde770c3af70fa150;hb=3d715fcd9a4c5ccea28a8e33a8e150be82aa0cec;hp=b192a7b05231c6d4f58ae35ce366ca775d5bef58;hpb=f19e9bc0fb51e29ecaa5427e39ebb182bd578a02;p=unres.git

diff --git a/source/cluster/wham/src/Makefile b/source/cluster/wham/src/Makefile
index b192a7b..333ebec 100644
--- a/source/cluster/wham/src/Makefile
+++ b/source/cluster/wham/src/Makefile
@@ -3,15 +3,9 @@ BIN=../../../../bin
 FC = ifort
 OPT = -O3 -ip -w
 OPT = -CB -g 
-<<<<<<< HEAD
-FFLAGS =  ${OPT} -c -I. -Iinclude_unres -I$(INSTALL_DIR)/include
-CPPFLAGS = -DLINUX -DPGI -DSPLITELE -DPROCOR -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DMP -DMPI
-LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a -g -d2 -CA -CB
-=======
 FFLAGS =  ${OPT} -c -I. -I./include_unres -I../src_MD_T-sccor -I/users/adam/MEY_MD/src_Tc-czarek -I$(INSTALL_DIR)/include
 CPPFLAGS = -DLINUX -DPGI -DSPLITELE -DPROCOR -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DMP -DMPI
 LIBS = -L$(INSTALL_DIR)/lib -lmpich ./xdrf/libxdrf.a -g -d2 -CA -CB
->>>>>>> devel
 
 .c.o:
 	cc -c -DLINUX -DPGI $*.c