[jboss-svn-commits] JBL Code SVN: r21397 - labs/jbossrules/branches/Branch_4_0_2_SOA_4_2.

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

Author: tirelli
Date: 2008-08-07 14:44:27 -0400 (Thu, 07 Aug 2008)
New Revision: 21397

Modified:
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/pom.xml
Log:
Fixing pom.xml

Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/pom.xml
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/pom.xml	2008-08-07 18:07:11 UTC (rev 21396)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/pom.xml	2008-08-07 18:44:27 UTC (rev 21397)
@@ -737,13 +737,8 @@
       </dependency>
 	    <dependency>
         <groupId>org.mvel</groupId>
-<<<<<<< .working
         <artifactId>mvel</artifactId>
-        <version>1.3.1-java1.4</version>
-=======
-        <artifactId>mvel</artifactId>
         <version>1.3.9-java1.4</version>
->>>>>>> .merge-right.r21394
       </dependency>
 
       <!-- drools-compiler -->