[Mattice-commits] r60 - pkg/man

[noreply at r-forge.r-project.org]

Author: andrew_hipp
Date: 2008-12-01 17:50:43 +0100 (Mon, 01 Dec 2008)
New Revision: 60

Modified:
   pkg/man/runBatchHansen.Rd
Log:
conflicts between previous versions resolved

Modified: pkg/man/runBatchHansen.Rd
===================================================================
--- pkg/man/runBatchHansen.Rd	2008-12-01 16:37:00 UTC (rev 59)
+++ pkg/man/runBatchHansen.Rd	2008-12-01 16:50:43 UTC (rev 60)
@@ -39,7 +39,7 @@
   \item{brown}{
 	Enter \code{T} or \code{F} according to whether you want to run the Brownian motion model.
     }
-  \item{rescale}
+  \item{rescale}{
 	Enter a value > 0 to rescale all trees to length = \code{rescale}.
     }
   \item{...}{