X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_CSA_DiL%2Frefsys.f;fp=source%2Funres%2Fsrc_CSA_DiL%2Frefsys.f;h=05030b55215c90bd2954bf908528a464a81e72df;hb=1606e1ed3e01fa02529bc9121a2583e4328ff69b;hp=8efc1ea84a1d1c2e7090364bc7fb072e5ba6c402;hpb=0b2500410688a3a6b769c7c1f00a7dc2ca662817;p=unres.git

diff --git a/source/unres/src_CSA_DiL/refsys.f b/source/unres/src_CSA_DiL/refsys.f
index 8efc1ea..05030b5 100644
--- a/source/unres/src_CSA_DiL/refsys.f
+++ b/source/unres/src_CSA_DiL/refsys.f
@@ -11,6 +11,10 @@ c form a linear fragment. returns vectors e1, e2, and e3.
       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.