[jboss-cvs] Repository SVN: r22847 - maven2/org/jboss/security/jboss-security-spi-parent.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2009-03-19 15:08:29 -0400 (Thu, 19 Mar 2009)
New Revision: 22847

Modified:
   maven2/org/jboss/security/jboss-security-spi-parent/maven-metadata.xml
Log:
checkin fixed metadata

Modified: maven2/org/jboss/security/jboss-security-spi-parent/maven-metadata.xml
===================================================================
--- maven2/org/jboss/security/jboss-security-spi-parent/maven-metadata.xml	2009-03-19 19:07:11 UTC (rev 22846)
+++ maven2/org/jboss/security/jboss-security-spi-parent/maven-metadata.xml	2009-03-19 19:08:29 UTC (rev 22847)
@@ -3,11 +3,7 @@
   <artifactId>jboss-security-spi-parent</artifactId>
   <version>2.0.2.CR11</version>
   <versioning>
-<<<<<<< .mine
     <release>2.1.0.20090318</release>
-=======
-    <release>2.0.3.GA</release>
->>>>>>> .r22840
     <versions>
       <version>2.0.2.CR11</version>
       <version>2.0.2.CR12</version>
@@ -18,17 +14,10 @@
       <version>2.0.2.SP4</version>
       <version>2.0.2.SP5</version>
       <version>2.0.2.SP6</version>
-<<<<<<< .mine
       <version>2.1.0.20090318</version>
-=======
       <version>2.0.2.SP7</version>
       <version>2.0.3.GA</version>
->>>>>>> .r22840
     </versions>
-<<<<<<< .mine
     <lastUpdated>20090318194201</lastUpdated>
-=======
-    <lastUpdated>20090305233202</lastUpdated>
->>>>>>> .r22840
   </versioning>
-</metadata>
\ No newline at end of file
+</metadata>