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

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

diff --git a/src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend b/src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend
index 2d0aac8..6f3b933 100644 (file)
--- a/src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend
+++ b/src/Tools/mrcImage/mrcImageSuperResolutionByOpticalFlow/src/X86LINUX64/.Depend
@@ -21,15 +21,24 @@ argCheck.o: argCheck.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
  ../inc/../inc/mrcImageSuperResolutionByOpticalFlow.h \
+<<<<<<< HEAD
+ /home/enokida/Eos/include/genUtil.h /usr/include/values.h \
+=======
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
+>>>>>>> refs/remotes/origin/master
  /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 \
  /usr/include/limits.h /usr/include/bits/posix1_lim.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 \
@@ -53,15 +62,24 @@ init.o: init.c /usr/include/stdc-predef.h /usr/include/stdio.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
  ../inc/../inc/mrcImageSuperResolutionByOpticalFlow.h \
+<<<<<<< HEAD
+ /home/enokida/Eos/include/genUtil.h /usr/include/values.h \
+=======
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
+>>>>>>> refs/remotes/origin/master
  /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 \
  /usr/include/limits.h /usr/include/bits/posix1_lim.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
 mrcImageSuperResolutionByOpticalFlow.o: \
  mrcImageSuperResolutionByOpticalFlow.c /usr/include/stdc-predef.h \
  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
@@ -86,17 +104,28 @@ mrcImageSuperResolutionByOpticalFlow.o: \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
  ../inc/../inc/mrcImageSuperResolutionByOpticalFlow.h \
+<<<<<<< HEAD
+ /home/enokida/Eos/include/genUtil.h /usr/include/values.h \
+=======
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
+>>>>>>> refs/remotes/origin/master
  /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 \
  /usr/include/limits.h /usr/include/bits/posix1_lim.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/Memory.h /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/Memory.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 \