Please enter the commit message for your changes. Lines starting

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

diff --git a/src/Tools/mrcImage/mrcImagePrint3D/src/X86LINUX64/.Depend b/src/Tools/mrcImage/mrcImagePrint3D/src/X86LINUX64/.Depend
index 5c39e7f..42dcb33 100644 (file)
--- a/src/Tools/mrcImage/mrcImagePrint3D/src/X86LINUX64/.Depend
+++ b/src/Tools/mrcImage/mrcImagePrint3D/src/X86LINUX64/.Depend
@@ -20,28 +20,17 @@ 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/mrcImagePrint3D.h /home/people/Eos/Eos/include/genUtil.h \
  /usr/include/values.h \
-=======
- ../inc/../inc/mrcImagePrint3D.h \
- /home/people/hisanaga0824/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/people/Eos/Eos/include/eosString.h \
  /home/people/Eos/Eos/include/File.h \
  /home/people/Eos/Eos/include/Memory.h
-=======
- /home/people/hisanaga0824/Eos/include/String.h \
- /home/people/hisanaga0824/Eos/include/File.h \
- /home/people/hisanaga0824/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 \
@@ -64,28 +53,17 @@ 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/mrcImagePrint3D.h /home/people/Eos/Eos/include/genUtil.h \
  /usr/include/values.h \
-=======
- ../inc/../inc/mrcImagePrint3D.h \
- /home/people/hisanaga0824/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/people/Eos/Eos/include/eosString.h \
  /home/people/Eos/Eos/include/File.h \
  /home/people/Eos/Eos/include/Memory.h
-=======
- /home/people/hisanaga0824/Eos/include/String.h \
- /home/people/hisanaga0824/Eos/include/File.h \
- /home/people/hisanaga0824/Eos/include/Memory.h
->>>>>>> refs/remotes/origin/master
 mrcImagePrint3D.o: mrcImagePrint3D.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 \