fixed merge conflict in readrtns_csa.F
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 18 Jun 2012 19:31:24 +0000 (21:31 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 18 Jun 2012 19:31:24 +0000 (21:31 +0200)
commiteccc8621829a703ab18edd4dfa4200b9a928dbcf
treeb4bf30cc114162cbebbc95badffaa843d9a43590
parent4a7d624a640e4671d0b0ecf3061c9e423c9390e9
fixed merge conflict in readrtns_csa.F
source/unres/src_CSA/readrtns_csa.F