X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2FTools%2Frandom%2FrandomUniformGet%2Fsrc%2FX86LINUX64%2F.Depend;h=d6ea7b2042af103b8fea88340d4a0e4027dfb901;hb=02c981da673027ebac9a14f9c1e6606ce9880981;hp=218055d328a499fcb93e3a69dfdf416825f58931;hpb=78604440ef14d021b439c8bd4fd6df36382a36af;p=eos%2FhostdependX86LINUX64.git

diff --git a/src/Tools/random/randomUniformGet/src/X86LINUX64/.Depend b/src/Tools/random/randomUniformGet/src/X86LINUX64/.Depend
index 218055d328..d6ea7b2042 100644
--- a/src/Tools/random/randomUniformGet/src/X86LINUX64/.Depend
+++ b/src/Tools/random/randomUniformGet/src/X86LINUX64/.Depend
@@ -20,28 +20,16 @@ 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/randomUniformGet.h /home/people/Eos/Eos/include/genUtil.h \
+ ../inc/../inc/randomUniformGet.h /home/tacyas/Eos/include/genUtil.h \
  /usr/include/values.h \
-=======
- ../inc/../inc/randomUniformGet.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
+ /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 \
@@ -64,28 +52,16 @@ 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/randomUniformGet.h /home/people/Eos/Eos/include/genUtil.h \
+ ../inc/../inc/randomUniformGet.h /home/tacyas/Eos/include/genUtil.h \
  /usr/include/values.h \
-=======
- ../inc/../inc/randomUniformGet.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
+ /home/tacyas/Eos/include/eosString.h /home/tacyas/Eos/include/File.h \
+ /home/tacyas/Eos/include/Memory.h
 randomUniformGet.o: randomUniformGet.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 \
@@ -108,14 +84,8 @@ randomUniformGet.o: randomUniformGet.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/randomUniformGet.h /home/people/Eos/Eos/include/Random.h \
- /home/people/Eos/Eos/include/Memory.h \
-=======
- ../inc/../inc/randomUniformGet.h \
- /home/people/hisanaga0824/Eos/include/Random.h \
- /home/people/hisanaga0824/Eos/include/Memory.h \
->>>>>>> refs/remotes/origin/master
+ ../inc/../inc/randomUniformGet.h /home/tacyas/Eos/include/Random.h \
+ /home/tacyas/Eos/include/Memory.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 \