X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=inline;f=source%2Fwham%2Fsrc-NEWSC%2FCOMMON.ALLPARM;h=40be928d81f90a48c0c99cdd412ed367620490d6;hb=29c003540813cc9069004b6a049512ab7a8b411e;hp=4e5fda85f6b31462b592ddb322268b45c6afce03;hpb=a1e9354f1eafa2a45a4106b9af32963cd8de73cf;p=unres.git

diff --git a/source/wham/src-NEWSC/COMMON.ALLPARM b/source/wham/src-NEWSC/COMMON.ALLPARM
index 4e5fda8..40be928 100644
--- a/source/wham/src-NEWSC/COMMON.ALLPARM
+++ b/source/wham/src-NEWSC/COMMON.ALLPARM
@@ -74,7 +74,11 @@
      & ithetyp_all(ntyp1,max_parm),ntheterm_all(max_parm),
      & ntheterm2_all(max_parm),ntheterm3_all(max_parm),
      & nsingle_all(max_parm),ndouble_all(max_parm),
+<<<<<<< HEAD
      & nntheterm_all(max_parm),nterm_sccor_all(max_parm,ntyp,ntyp)
+=======
+     & nntheterm_all(max_parm),nterm_sccor_all(ntyp,ntyp,max_parm)
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
       common /allparm/ ww_all,vbldp0_all,akp_all,vbldsc0_all,aksc_all,
      & abond0_all,aa0thet_all,aathet_all,bbthet_all,ccthet_all,
      & ddthet_all,eethet_all,ffthet_all,ggthet_all,