X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD%2Fcinfo.f;h=2ac4166eb7cff36045729cbdb10b59f36d1eb5e1;hb=2a226bfc86eabc6e4eae0c3ad1cbc3cb5417a05a;hp=0597d4e02ae7457b8fe92c23658ae57e69df3e1e;hpb=f9e536df1fd1627429123fe8990edfcdc2cc1a9a;p=unres.git

diff --git a/source/unres/src_MD/cinfo.f b/source/unres/src_MD/cinfo.f
index 0597d4e..2ac4166 100644
--- 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:',