X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-NEWSC%2FDIMENSIONS.FREE;h=01fdea65820e12349f260e3576513cbf2bc6fcbc;hb=e74a1da46f47c86b0c46679481b757c425642977;hp=a2eb4e5fbcf3fac4968a6fb556ee45eef2051bd6;hpb=c89d7d207940ebb57e0042cb35ab65d0f8a4b55e;p=unres.git

diff --git a/source/wham/src-NEWSC/DIMENSIONS.FREE b/source/wham/src-NEWSC/DIMENSIONS.FREE
index a2eb4e5..01fdea6 100644
--- a/source/wham/src-NEWSC/DIMENSIONS.FREE
+++ b/source/wham/src-NEWSC/DIMENSIONS.FREE
@@ -2,7 +2,11 @@
       integer MaxQ,MaxQ1
       integer MaxR,MaxT_h
       integer MaxSlice
+<<<<<<< HEAD
       parameter (Max_Parm=128)
+=======
+      parameter (Max_Parm=1)
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
       parameter (MaxQ=4,MaxQ1=MaxQ+2)
       parameter(MaxR=1,MaxT_h=32)
       parameter(MaxSlice=40)