Stirng.h -> eosString.h

[eos/base.git] / src / Tools / pdbUtil / pdbMatrixCreate / src / pdbMatrixCreate.html

diff --git a/src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html b/src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html
index 1d5492a..ebfde53 100755 (executable)
--- a/src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html
+++ b/src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
 /bin/bash: pdbMatrixCreate: そのようなファイルやディレクトリはありません
-=======
-/bin/bash: pdbMatrixCreate: No such file or directory
->>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa