Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Fri, 3 Jan 2020 18:16:11 +0000 (19:16 +0100)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Fri, 3 Jan 2020 18:16:11 +0000 (19:16 +0100)
commitc6f305ff4a0b1fdc111572dc9692d866b9ffbb15
tree9e98d5a92bab8b41bcedde057cba9b7679032d11
parent532215c67bc6381096ff9494a83f507c4d2474b9
parenta25c7f552431c3edd22800ac5a91a028f0f5e996
Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM

Conflicts:
source/unres/io_config.F90
source/unres/energy.F90
source/unres/io_config.F90