recompiled:

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

diff --git a/src/Tools/mrcImage/mrcImageShiftFollowingGC/src/X86LINUX64/.Depend b/src/Tools/mrcImage/mrcImageShiftFollowingGC/src/X86LINUX64/.Depend
index c7ca380..3faffc5 100644 (file)
--- a/src/Tools/mrcImage/mrcImageShiftFollowingGC/src/X86LINUX64/.Depend
+++ b/src/Tools/mrcImage/mrcImageShiftFollowingGC/src/X86LINUX64/.Depend
@@ -21,25 +21,15 @@ 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/mrcImageShiftFollowingGC.h \
-<<<<<<< HEAD
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
  /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/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
  /home/tacyas/Eos/include/Memory.h
-=======
- /home/people/Eos/Eos/include/eosString.h \
- /home/people/Eos/Eos/include/File.h \
- /home/people/Eos/Eos/include/Memory.h
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
 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 \
@@ -63,25 +53,15 @@ 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/mrcImageShiftFollowingGC.h \
-<<<<<<< HEAD
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
  /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/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
  /home/tacyas/Eos/include/Memory.h
-=======
- /home/people/Eos/Eos/include/eosString.h \
- /home/people/Eos/Eos/include/File.h \
- /home/people/Eos/Eos/include/Memory.h
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
 mrcImageShiftFollowingGC.o: mrcImageShiftFollowingGC.c \
  /usr/include/stdc-predef.h /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
@@ -105,18 +85,13 @@ mrcImageShiftFollowingGC.o: mrcImageShiftFollowingGC.c \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
  ../inc/../inc/mrcImageShiftFollowingGC.h \
-<<<<<<< HEAD
  /home/tacyas/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
  /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/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 \
@@ -124,19 +99,6 @@ mrcImageShiftFollowingGC.o: mrcImageShiftFollowingGC.c \
  /home/tacyas/Eos/include/Memory.h /home/tacyas/Eos/include/mrcImage.h \
  /home/tacyas/Eos/include/lmrcImageModeChange.h \
  /home/tacyas/Eos/include/lmrcImageDensityInverse.h
-=======
- /home/people/Eos/Eos/include/mrcImage.h \
- /home/people/Eos/Eos/include/genUtil.h \
- /home/people/Eos/Eos/include/Matrix3D.h \
- /home/people/Eos/Eos/include/Vector.h \
- /home/people/Eos/Eos/include/Array.h \
- /home/people/Eos/Eos/include/ctfInfo.h \
- /home/people/Eos/Eos/include/lmrcImageDensity.h \
- /home/people/Eos/Eos/include/Memory.h \
- /home/people/Eos/Eos/include/mrcImage.h \
- /home/people/Eos/Eos/include/lmrcImageModeChange.h \
- /home/people/Eos/Eos/include/lmrcImageDensityInverse.h
->>>>>>> 4a37b0bd13c46a2cb94c7ef1ef847d45bafe78f3
 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 \