Merge branch 'prerelease-3.2.1' into czarek

[unres.git] / source / unres / src_MD / cinfo.f

diff --git a/source/unres/src_MD/cinfo.f b/source/unres/src_MD/cinfo.f
index 0597d4e..2ac4166 100644 (file)
--- a/source/unres/src_MD/cinfo.f
+++ b/source/unres/src_MD/cinfo.f
@@ -1,4 +1,13 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
+<<<<<<< HEAD
+C 3 2 105
+      subroutine cinfo
+      include 'COMMON.IOUNITS'
+      write(iout,*)'++++ Compile info ++++'
+      write(iout,*)'Version 3.2 build 105'
+      write(iout,*)'compiled Tue Feb 19 05:33:00 2013'
+      write(iout,*)'compiled by czarek@piasek3'
+=======
 C 3 2 116
       subroutine cinfo
       include 'COMMON.IOUNITS'
@@ -6,6 +15,7 @@ C 3 2 116
       write(iout,*)'Version 3.2 build 116'
       write(iout,*)'compiled Thu Nov 27 09:56:51 2014'
       write(iout,*)'compiled by adam@mmka'
+>>>>>>> prerelease-3.2.1
       write(iout,*)'OS name:    Linux '
       write(iout,*)'OS release: 3.2.0-72-generic '
       write(iout,*)'OS version:',