resolving merge conflicts
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 18 Jun 2012 18:55:41 +0000 (20:55 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 18 Jun 2012 18:55:41 +0000 (20:55 +0200)
commit7411f0a7dbaeafebf09151a310451b5989035e76
tree688c47f8ecb8dc91185c107ffe98e6914caacec7
parent3a261ae36be53eb4fadc9f30179cebb122b5b280
resolving merge conflicts
.gitignore
examples/unres/MD/ff_gab/1L2Y_minim.inp
source/cluster/wham/src/DIMENSIONS.COMPAR
source/cluster/wham/src/include_unres/COMMON.INTERACT
source/cluster/wham/src/include_unres/COMMON.SBRIDGE
source/cluster/wham/src/include_unres/COMMON.TORSION
source/unres/src_MD/cinfo.f
source/xdrfpdb/src/xdrf2ang.f
source/xdrfpdb/src/xdrf2pdb-m.F