[GRASS-SVN] r62612 - grass-addons/grass7/vector/v.nnstat

[svn_grass at osgeo.org]

Author: evas
Date: 2014-11-05 05:14:20 -0800 (Wed, 05 Nov 2014)
New Revision: 62612

Modified:
   grass-addons/grass7/vector/v.nnstat/v.nnstat.html
Log:
updated v.nnstat.html

Modified: grass-addons/grass7/vector/v.nnstat/v.nnstat.html
===================================================================
--- grass-addons/grass7/vector/v.nnstat/v.nnstat.html	2014-11-05 13:12:05 UTC (rev 62611)
+++ grass-addons/grass7/vector/v.nnstat/v.nnstat.html	2014-11-05 13:14:20 UTC (rev 62612)
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 <h2>NAME</h2>
 
 <b>v.nnstat</b> - indicates clusters, separations or random distribution of point <b>layer</b> in 2D or 3D space.
@@ -63,28 +62,3 @@
 
 <p>
 <i>Last changed: $Date$</i>
-=======
-<h2>DESCRIPTION</h2>
-
-TODO
-
-<h2>EXAMPLES</h2>
-
-TODO
-
-<h2>REQUIREMENTS</h2>
-
-<ul>
-  <li><b>LAPACK / BLAS</b> (libraries for numerical computing) for
-    GMATH library (GRASS Numerical Library)<br>
-    <a href="http://www.netlib.org/lapack">http://www.netlib.org/lapack</a> (usually available on Linux distros)
-  <li><a href="http://pointclouds.org">Point Cloud Library</a>
-</ul>
-
-<h2>AUTHOR</h2>
-
-Eva Stopkova
-
-<p>
-<i>Last changed: $Date$</i>
->>>>>>> .r62610