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

diff --git a/source/unres/src_MD/cinfo.f b/source/unres/src_MD/cinfo.f
index 809ac00..2168fb7 100644
--- a/source/unres/src_MD/cinfo.f
+++ b/source/unres/src_MD/cinfo.f
@@ -1,10 +1,19 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
-C 2 5 26
+<<<<<<< HEAD
+C 3 1 9
       subroutine cinfo
       include 'COMMON.IOUNITS'
       write(iout,*)'++++ Compile info ++++'
-      write(iout,*)'Version 2.5 build 26'
-      write(iout,*)'compiled Thu Sep 20 10:30:29 2012'
+      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.32-42-generic '