X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD%2Fcinfo.f;h=2168fb7adb24b1314b4ffdfd3fcd60d84485876d;hb=a1b7a213eef48965c9aa349a761ebeca646a0b7e;hp=f4b921c104137fb800ac32d220258ed9eadda262;hpb=e7fd0c7782f6f624b41009800df8e3d5e0e9add5;p=unres.git

diff --git a/source/unres/src_MD/cinfo.f b/source/unres/src_MD/cinfo.f
index f4b921c..2168fb7 100644
--- a/source/unres/src_MD/cinfo.f
+++ b/source/unres/src_MD/cinfo.f
@@ -1,15 +1,24 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
-C 2 5 297
+<<<<<<< HEAD
+C 3 1 9
       subroutine cinfo
       include 'COMMON.IOUNITS'
       write(iout,*)'++++ Compile info ++++'
-      write(iout,*)'Version 2.5 build 297'
-      write(iout,*)'compiled Mon Jun 25 07:29:48 2012'
-      write(iout,*)'compiled by aks255@matrix.chem.cornell.edu'
+      write(iout,*)'Version 3.1 build 9'
+      write(iout,*)'compiled Mon Sep 24 13:56:56 2012'
+=======
+C 3 1 41
+      subroutine cinfo
+      include 'COMMON.IOUNITS'
+      write(iout,*)'++++ Compile info ++++'
+      write(iout,*)'Version 3.1 build 41'
+      write(iout,*)'compiled Fri Feb 15 01:43:03 2013'
+>>>>>>> b09212e... adding ename to statout with PRINT_COMPON
+      write(iout,*)'compiled by czarek@piasek3'
       write(iout,*)'OS name:    Linux '
-      write(iout,*)'OS release: 2.6.34.9-69.fc13.x86_64 '
+      write(iout,*)'OS release: 2.6.32-42-generic '
       write(iout,*)'OS version:',
-     & ' #1 SMP Tue May 3 09:23:03 UTC 2011 '
+     & ' #96-Ubuntu SMP Wed Aug 15 19:37:37 UTC 2012 '
       write(iout,*)'flags:'
       write(iout,*)'INSTALL_DIR = /users/software/mpich-1.2.7p1_int...'
       write(iout,*)'FC= ifort'