[seam-commits] Seam SVN: r14408 - branches/community/Seam_2_3/jboss-seam-parent.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-03-14 13:54:04 -0400 (Wed, 14 Mar 2012)
New Revision: 14408

Modified:
   branches/community/Seam_2_3/jboss-seam-parent/pom.xml
Log:
fixed forgotten leftover after merging conflict

Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml	2012-03-14 17:53:58 UTC (rev 14407)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml	2012-03-14 17:54:04 UTC (rev 14408)
@@ -145,11 +145,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-<<<<<<< HEAD
-
-=======
-			
->>>>>>> 28045d7... refactored ee6 artifacts into standard Seam modules
 			<dependency>
 				<groupId>org.jboss.seam</groupId>
 				<artifactId>jboss-seam-debug</artifactId>