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

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

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