X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fcluster%2Fwham%2Fsrc%2Finclude_unres%2FCOMMON.SBRIDGE;h=2848b610a205f05b41892f3ee90d9b1b427f4ef0;hb=52187c9365594597457799445140ea830f1141a3;hp=7bba010b60dd3f54db442d2a60e6f4782ce96c64;hpb=951f0fe4ce7a66542c398754524d8ae3d9b5dc5a;p=unres.git

diff --git a/source/cluster/wham/src/include_unres/COMMON.SBRIDGE b/source/cluster/wham/src/include_unres/COMMON.SBRIDGE
index 7bba010..2848b61 100644
--- 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