X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD-M%2Fcinfo.f;fp=source%2Funres%2Fsrc_MD-M%2Fcinfo.f;h=db2389950f0453a099c0053bbf658b56faf99e7c;hb=c16c0dde5e41c15776ead4accc08b9cdbe742607;hp=c7b5141444ea75f56d10e8e7478e9c53d3f7d080;hpb=e39b9b369e87de20bb1826764be18633ea348f58;p=unres.git

diff --git a/source/unres/src_MD-M/cinfo.f b/source/unres/src_MD-M/cinfo.f
index c7b5141..db23899 100644
--- a/source/unres/src_MD-M/cinfo.f
+++ b/source/unres/src_MD-M/cinfo.f
@@ -1,4 +1,5 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
+<<<<<<< HEAD
 C 0 40360 9
       subroutine cinfo
       include 'COMMON.IOUNITS'
@@ -6,12 +7,25 @@ C 0 40360 9
       write(iout,*)'Version 0.40360 build 9'
       write(iout,*)'compiled Fri Jan 23 21:00:08 2015'
       write(iout,*)'compiled by adam@mmka'
+=======
+C 0 40360 1
+      subroutine cinfo
+      include 'COMMON.IOUNITS'
+      write(iout,*)'++++ Compile info ++++'
+      write(iout,*)'Version 0.40360 build 1'
+      write(iout,*)'compiled Wed Jan  7 10:41:15 2015'
+      write(iout,*)'compiled by czarek@piasek4'
+>>>>>>> 9a082c1ab203120d8e865971546d473fb146fcdc
       write(iout,*)'OS name:    Linux '
       write(iout,*)'OS release: 3.2.0-72-generic '
       write(iout,*)'OS version:',
      & ' #107-Ubuntu SMP Thu Nov 6 14:24:01 UTC 2014 '
       write(iout,*)'flags:'
+<<<<<<< HEAD
       write(iout,*)'INSTALL_DIR = /users/software/mpich-1.2.7p1_int...'
+=======
+      write(iout,*)'INSTALL_DIR = /users/software/mpich2-1.4.1p1_in...'
+>>>>>>> 9a082c1ab203120d8e865971546d473fb146fcdc
       write(iout,*)'FC= ifort'
       write(iout,*)'OPT =  -O3 -ip '
       write(iout,*)'FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include '