CASP3 force field deleted. Fixed merge conflicts.
authorBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 8 Aug 2012 10:25:53 +0000 (12:25 +0200)
committerBartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
Wed, 8 Aug 2012 10:25:53 +0000 (12:25 +0200)
commit049509a7c6e9e4f8b7f9302a638dc90eced194e9
treec4bd82b82154452b7747ccb1ab2a20f50dd2c36c
parent56dccff0723472c3c38439f03012b5c9424f05f8
parent7f1620e54300460dd097c00adb6c97ac454cbfb2
CASP3 force field deleted. Fixed merge conflicts.

Merge branch 'devel' of mmka:unres into devel

Conflicts:
.gitignore
examples/unres/CSA/CASP3/ENERGY/unres_casp3.csh
source/unres/src_CSA/Makefile