Merge branch 'master' of git.osdn.jp:/gitroot/eos/base

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

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