[Phylobase-commits] r171 - pkg/R

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

Author: skembel
Date: 2008-03-24 23:52:32 +0100 (Mon, 24 Mar 2008)
New Revision: 171

Modified:
   pkg/R/pdata.R
Log:
Modify last lines of pdata.R to test conflict resolution error

Modified: pkg/R/pdata.R
===================================================================
--- pkg/R/pdata.R	2008-03-23 21:13:22 UTC (rev 170)
+++ pkg/R/pdata.R	2008-03-24 22:52:32 UTC (rev 171)
@@ -82,3 +82,4 @@
 ## z[,"a"]
 ## z[[2]]
 
+## test conflict resolution error
\ No newline at end of file