Conflicts:
bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
source/unres/src_CSA/Makefile
source/unres/src_CSA_DiL/refsys.f
source/unres/src_MD-M/Makefile
source/unres/src_MD/parmread.F
source/unres/src_MD_DFA/COMMON.REFSYS
logical fail
double precision e1(3),e2(3),e3(3)
double precision u(3),z(3)
++<<<<<<< HEAD
++=======
+ include 'COMMON.IOUNITS'
++>>>>>>> prerelease-3.2.1
include "COMMON.CHAIN"
data coinc /1.0d-13/,align /1.0d-13/
fail=.false.
printmat.f
randgens.f
readrtns_min.F
+ refsys.f
rescode.f
+ refsys.f
rmdd.f
sc_move.F
sumsld.f