source/cluster/wham/src/COMMON.CONTROL

   1       double precision betaT
   2       integer iscode,indpdb,outpdb,outmol2,iopt,nstart,nend,constr_dist
   3       logical refstr,pdbref,punch_dist,print_dist,caonly,lside,
   4      & lprint_cart,lprint_int,from_cart,efree,from_bx,from_cx,
   5 <<<<<<< HEAD
   6      & with_dihed_constr
   7       common /cntrl/ betaT,iscode,indpdb,refstr,pdbref,outpdb,outmol2,
   8      & punch_dist,print_dist,caonly,lside,lprint_cart,lprint_int,
   9      & from_cart,from_bx,from_cx,efree,iopt,nstart,nend,constr_dist,
  10      & with_dihed_constr
  11 =======
  12      & with_dihed_constr,out1file,print_homology_restraints,
  13      & print_contact_map,print_homology_models
  14       common /cntrl/ betaT,iscode,indpdb,refstr,pdbref,outpdb,outmol2,
  15      & punch_dist,print_dist,caonly,lside,lprint_cart,lprint_int,
  16      & from_cart,from_bx,from_cx,efree,iopt,nstart,nend,constr_dist,
  17      & with_dihed_constr, constr_homology,homol_nset,out1file,
  18      & print_contact_map
  19       common /cntrlr/ waga_homology(10),
  20      & waga_dist, waga_angle, waga_theta, waga_d, dist_cut,iset,
  21      & print_homology_restraints,print_homology_models
  22
  23 >>>>>>> 3d6f9e7... Adam's changes to wham and cluster following previous commit