X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-M%2FCMakeLists.txt;h=2576a150e54653c996e56595437c29532a43e1f9;hb=5777ba5f2d65f7d033ad2593f52e044a891ded24;hp=c107311a28d5c9fc994ed6d74bfaac6d812ed1cf;hpb=5316f1d82cb17d390be734cefbfca809cc65dcc4;p=unres.git

diff --git a/source/wham/src-M/CMakeLists.txt b/source/wham/src-M/CMakeLists.txt
index c107311..2576a15 100644
--- a/source/wham/src-M/CMakeLists.txt
+++ b/source/wham/src-M/CMakeLists.txt
@@ -118,22 +118,12 @@ if(UNRES_MD_FF STREQUAL "GAB" )
   # set preprocesor flags   
   set(CPPFLAGS "PROCOR  -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC  -DSCCORPDB" )
 
-<<<<<<< HEAD
-if(UNRES_MD_FF STREQUAL "GAB" )
-  # set preprocesor flags   
-  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC  -DSCCORPDB" )
 
-=======
->>>>>>> devel
 #=========================================
 #  Settings for E0LL2Y force field
 #=========================================
 elseif(UNRES_MD_FF STREQUAL "E0LL2Y")
   # set preprocesor flags   
-<<<<<<< HEAD
-  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DSCCORPDB" )
-endif(UNRES_MD_FF STREQUAL "GAB")
-=======
   set(CPPFLAGS "PROCOR  -DSPLITELE -DSCCORPDB" )
 endif(UNRES_MD_FF STREQUAL "GAB")
 
@@ -141,7 +131,6 @@ endif(UNRES_MD_FF STREQUAL "GAB")
 # Additional flags
 #=========================================
 set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN") 
->>>>>>> devel
 
 #=========================================
 # System specific flags