X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD%2Fcinfo.f;fp=source%2Funres%2Fsrc_MD%2Fcinfo.f;h=b54ec8c2fc84d19762a19b5e2659ded59373078b;hb=52187c9365594597457799445140ea830f1141a3;hp=343803990f8a56ed7f350fe88198a76163ff779d;hpb=951f0fe4ce7a66542c398754524d8ae3d9b5dc5a;p=unres.git

diff --git a/source/unres/src_MD/cinfo.f b/source/unres/src_MD/cinfo.f
index 3438039..b54ec8c 100644
--- a/source/unres/src_MD/cinfo.f
+++ b/source/unres/src_MD/cinfo.f
@@ -1,4 +1,5 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
+<<<<<<< HEAD
 C 2 5 66
       subroutine cinfo
       include 'COMMON.IOUNITS'
@@ -6,13 +7,29 @@ C 2 5 66
       write(iout,*)'Version 2.5 build 66'
       write(iout,*)'compiled Thu Jun 14 06:40:11 2012'
       write(iout,*)'compiled by adam@matrix.chem.cornell.edu'
+=======
+C 2 5 295
+      subroutine cinfo
+      include 'COMMON.IOUNITS'
+      write(iout,*)'++++ Compile info ++++'
+      write(iout,*)'Version 2.5 build 295'
+      write(iout,*)'compiled Mon Jun 18 05:08:20 2012'
+      write(iout,*)'compiled by aks255@matrix.chem.cornell.edu'
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
       write(iout,*)'OS name:    Linux '
       write(iout,*)'OS release: 2.6.34.9-69.fc13.x86_64 '
       write(iout,*)'OS version:',
      & ' #1 SMP Tue May 3 09:23:03 UTC 2011 '
       write(iout,*)'flags:'
+<<<<<<< HEAD
       write(iout,*)'FC = ifort'
       write(iout,*)'FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include'
+=======
+      write(iout,*)'INSTALL_DIR = /users/software/mpich-1.2.7p1_int...'
+      write(iout,*)'FC= ifort'
+      write(iout,*)'OPT =  -g -ip -w -CB '
+      write(iout,*)'FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include '
+>>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
       write(iout,*)'FFLAGS1 = -c -w -g -d2 -CA -CB -I$(INSTALL_DIR)...'
       write(iout,*)'FFLAGS2 = -c -w -g -O0 -I$(INSTALL_DIR)/include'
       write(iout,*)'FFLAGSE = -c -w -O3 -ipo -ipo_obj  -opt_report ...'