source/cluster/wham/src/include_unres/COMMON.SBRIDGE

   1       double precision ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,dhpb,
   2 <<<<<<< HEAD
   3      & dhpb1,forcon,weidis
   4       integer ns,nss,nfree,iss,ihpb,jhpb,nhpb,link_start,link_end,
   5      & ibecarb
   6       common /sbridge/ ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,ns,nss,
   7      &  nfree,iss(maxss)
   8       common /links/ dhpb(maxdim),dhpb1(maxdim),forcon(maxdim),
   9      & ihpb(maxdim),jhpb(maxdim),ibecarb(maxdim),nhpb
  10 =======
  11      & forcon,weidis
  12       integer ns,nss,nfree,iss,ihpb,jhpb,nhpb,link_start,link_end
  13       common /sbridge/ ebr,d0cm,akcm,akth,akct,v1ss,v2ss,v3ss,ns,nss,
  14      &  nfree,iss(maxss)
  15       common /links/ dhpb(maxdim),forcon(maxdim),ihpb(maxdim),
  16      & jhpb(maxdim),nhpb
  17 >>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
  18       common /restraints/ weidis
  19       common /links_split/ link_start,link_end