Merge remote-tracking branch 'refs/remotes/origin/master'

[eos/hostdependX86LINUX64.git] / src / Tools / mrcImage / mrcImageDivergence / src / X86LINUX64 / .Depend

diff --git a/src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend b/src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend
index 3c7abbe..d9252d6 100644 (file)
--- a/src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend
+++ b/src/Tools/mrcImage/mrcImageDivergence/src/X86LINUX64/.Depend
@@ -20,7 +20,11 @@ argCheck.o: argCheck.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
+<<<<<<< HEAD
+ ../inc/../inc/mrcImageDivergence.h /home/enokida/Eos/include/genUtil.h \
+=======
  ../inc/../inc/mrcImageDivergence.h /home/tacyas/Eos/include/genUtil.h \
+>>>>>>> refs/remotes/origin/master
  /usr/include/values.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \
@@ -28,8 +32,13 @@ argCheck.o: argCheck.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \
+<<<<<<< HEAD
+ /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \
+ /home/enokida/Eos/include/Memory.h
+=======
  /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
  /home/tacyas/Eos/include/Memory.h
+>>>>>>> refs/remotes/origin/master
 init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
@@ -52,7 +61,11 @@ init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
+<<<<<<< HEAD
+ ../inc/../inc/mrcImageDivergence.h /home/enokida/Eos/include/genUtil.h \
+=======
  ../inc/../inc/mrcImageDivergence.h /home/tacyas/Eos/include/genUtil.h \
+>>>>>>> refs/remotes/origin/master
  /usr/include/values.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \
@@ -60,8 +73,13 @@ init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \
+<<<<<<< HEAD
+ /home/enokida/Eos/include/eosString.h /home/enokida/Eos/include/File.h \
+ /home/enokida/Eos/include/Memory.h
+=======
  /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
  /home/tacyas/Eos/include/Memory.h
+>>>>>>> refs/remotes/origin/master
 mrcImageDivergence.o: mrcImageDivergence.c /usr/include/stdc-predef.h \
  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
@@ -84,7 +102,11 @@ mrcImageDivergence.o: mrcImageDivergence.c /usr/include/stdc-predef.h \
  /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
+<<<<<<< HEAD
+ ../inc/../inc/mrcImageDivergence.h /home/enokida/Eos/include/genUtil.h \
+=======
  ../inc/../inc/mrcImageDivergence.h /home/tacyas/Eos/include/genUtil.h \
+>>>>>>> refs/remotes/origin/master
  /usr/include/values.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/limits.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/syslimits.h \
@@ -92,9 +114,15 @@ mrcImageDivergence.o: mrcImageDivergence.c /usr/include/stdc-predef.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
  /usr/lib/gcc/x86_64-redhat-linux/4.8.5/include/float.h \
+<<<<<<< HEAD
+ /home/enokida/Eos/include/mrcImage.h /home/enokida/Eos/include/genUtil.h \
+ /home/enokida/Eos/include/Matrix3D.h /home/enokida/Eos/include/Vector.h \
+ /home/enokida/Eos/include/Array.h /home/enokida/Eos/include/ctfInfo.h
+=======
  /home/tacyas/Eos/include/mrcImage.h /home/tacyas/Eos/include/genUtil.h \
  /home/tacyas/Eos/include/Matrix3D.h /home/tacyas/Eos/include/Vector.h \
  /home/tacyas/Eos/include/Array.h /home/tacyas/Eos/include/ctfInfo.h
+>>>>>>> refs/remotes/origin/master
 usage.o: usage.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \