/usr/include/bits/nan.h /usr/include/bits/mathdef.h \
/usr/include/bits/mathcalls.h ../inc/config.h \
../inc/../inc/mrcImageSinogramCreate.h \
-<<<<<<< HEAD
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/hisanaga0824/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> refs/remotes/origin/master
+ /home/tacyas/Eos/include/genUtil.h /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 \
/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
+ /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
+ /home/tacyas/Eos/include/Memory.h
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 \
/usr/include/bits/nan.h /usr/include/bits/mathdef.h \
/usr/include/bits/mathcalls.h ../inc/config.h \
../inc/../inc/mrcImageSinogramCreate.h \
-<<<<<<< HEAD
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/hisanaga0824/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> refs/remotes/origin/master
+ /home/tacyas/Eos/include/genUtil.h /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 \
/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
+ /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
+ /home/tacyas/Eos/include/Memory.h
mrcImageSinogramCreate.o: mrcImageSinogramCreate.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/bits/nan.h /usr/include/bits/mathdef.h \
/usr/include/bits/mathcalls.h ../inc/config.h \
../inc/../inc/mrcImageSinogramCreate.h \
-<<<<<<< HEAD
- /home/people/Eos/Eos/include/genUtil.h /usr/include/values.h \
-=======
- /home/people/hisanaga0824/Eos/include/genUtil.h /usr/include/values.h \
->>>>>>> refs/remotes/origin/master
+ /home/tacyas/Eos/include/genUtil.h /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 \
/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/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/lmrcImageSinogram.h \
- /home/people/Eos/Eos/include/mrcImage.h
-=======
- /home/people/hisanaga0824/Eos/include/mrcImage.h \
- /home/people/hisanaga0824/Eos/include/genUtil.h \
- /home/people/hisanaga0824/Eos/include/Matrix3D.h \
- /home/people/hisanaga0824/Eos/include/Vector.h \
- /home/people/hisanaga0824/Eos/include/Array.h \
- /home/people/hisanaga0824/Eos/include/ctfInfo.h \
- /home/people/hisanaga0824/Eos/include/lmrcImageSinogram.h \
- /home/people/hisanaga0824/Eos/include/mrcImage.h
->>>>>>> refs/remotes/origin/master
+ /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 \
+ /home/tacyas/Eos/include/lmrcImageSinogram.h \
+ /home/tacyas/Eos/include/mrcImage.h
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 \