X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-NEWSC%2Freadrtns.F;h=99677609e8f99830b53c1fa41be7f5ba53fd7c62;hb=e74a1da46f47c86b0c46679481b757c425642977;hp=c13b16eb290efa4d2954062cbfe57464333021e1;hpb=d0bc9ab44e8f75f5cb92a01cda9daba97791e379;p=unres.git

diff --git a/source/wham/src-NEWSC/readrtns.F b/source/wham/src-NEWSC/readrtns.F
index c13b16e..9967760 100644
--- a/source/wham/src-NEWSC/readrtns.F
+++ b/source/wham/src-NEWSC/readrtns.F
@@ -42,6 +42,10 @@
      &    nparmset, Max_Parm
         return1
       endif
+<<<<<<< HEAD
+=======
+      energy_dec=index(controlcard,"ENERGY_DEC").gt.0
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
       call readi(controlcard,"MAXIT",maxit,5000)
       call reada(controlcard,"FIMIN",fimin,1.0d-3)
       call readi(controlcard,"ENSEMBLES",ensembles,0)