Bug fixed:

[eos/hostdependX86LINUX64.git] / src / Tools / pdbUtil / pdbPCA / src / pdbPCA.html
diff --git a/src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html b/src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html

index 420bcc5..b8fe2b3 100755 (executable)
--- a/src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
+++ b/src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
@@ -1 +1,25 @@
+<<<<<<< HEAD
  /bin/bash: pdbPCA: そのようなファイルやディレクトリはありません
+=======
+<HTML>
+<HEAD>
+<TITLE>pdbPCA</TITLE>
+</HEAD>
+<BODY>
+<H1>pdbPCA</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: pdbPCA
+Options:
+    [-i[nput]            In                  (stdin     )] :Optional  :InputDataFile
+    [-o[utput]           Out                 (stdout    )] :Optional  :Output: Result
+    [-o[utput]U[nit]     OutUnit             (NULL      )] :Optional  :Output: Unit Vector Array
+    [-o[utput]M[atrix3D] OutMat3D            (NULL      )] :Optional  :Output: Matrix3D from Unit Vector Array
+    [-o[utput]PDB        OutPDB              (NULL      )] :Optional  :Output: PDB rotated from Unit Vector Array
+    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         )] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
+>>>>>>> FETCH_HEAD