Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

[unres.git] / source / cluster / wham / src / include_unres / COMMON.SBRIDGE

diff --git a/source/cluster/wham/src/include_unres/COMMON.SBRIDGE b/source/cluster/wham/src/include_unres/COMMON.SBRIDGE
index 7bba010..2848b61 100644 (file)
--- a/source/cluster/wham/src/include_unres/COMMON.SBRIDGE
+++ b/source/cluster/wham/src/include_unres/COMMON.SBRIDGE
@@ -1,4 +1,5 @@
       double precision ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,dhpb,
+<<<<<<< HEAD
      & dhpb1,forcon,weidis
       integer ns,nss,nfree,iss,ihpb,jhpb,nhpb,link_start,link_end,
      & ibecarb
@@ -6,5 +7,13 @@
      &  nfree,iss(maxss)
       common /links/ dhpb(maxdim),dhpb1(maxdim),forcon(maxdim),
      & ihpb(maxdim),jhpb(maxdim),ibecarb(maxdim),nhpb
+=======
+     & forcon,weidis
+      integer ns,nss,nfree,iss,ihpb,jhpb,nhpb,link_start,link_end
+      common /sbridge/ ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,ns,nss,
+     &  nfree,iss(maxss)
+      common /links/ dhpb(maxdim),forcon(maxdim),ihpb(maxdim),
+     & jhpb(maxdim),nhpb
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
       common /restraints/ weidis
       common /links_split/ link_start,link_end