Author: jvanzyl
Date: Wed Oct 10 22:52:29 2012
New Revision: 1396844
URL: http://svn.apache.org/viewvc?rev=1396844&view=rev
Log:
o cleanup from git svn merge problem i created
Modified:
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1396844&r1=1396843&r2=1396844&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Wed Oct 10 22:52:29 2012
@@ -214,18 +214,7 @@
<artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
<scope>runtime</scope>
-<<<<<<< HEAD
- </dependency>
-=======
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4jVersion}</version>
- <scope>runtime</scope>
- </dependency>
-
->>>>>>> 4595e08... o Use SLF4J for logging
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
