You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2007/10/10 15:50:02 UTC
svn commit: r583473 -
/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
Author: markh
Date: Wed Oct 10 06:50:01 2007
New Revision: 583473
URL: http://svn.apache.org/viewvc?rev=583473&view=rev
Log:
Removed conflict
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt?rev=583473&r1=583472&r2=583473&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt Wed Oct 10 06:50:01 2007
@@ -560,11 +560,7 @@
+---+
mvn dependency:analyze
+---+
-<<<<<<< .mine
-=======
-
->>>>>>> .r579027
Sample output:
+---+