camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmuel...@apache.org
Subject svn commit: r1180787 - /camel/branches/camel-2.7.x/parent/pom.xml
Date Mon, 10 Oct 2011 05:58:31 GMT
Author: cmueller
Date: Mon Oct 10 05:58:31 2011
New Revision: 1180787

URL: http://svn.apache.org/viewvc?rev=1180787&view=rev
Log:
fixed merge failure from privious commit

Modified:
    camel/branches/camel-2.7.x/parent/pom.xml

Modified: camel/branches/camel-2.7.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/parent/pom.xml?rev=1180787&r1=1180786&r2=1180787&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/parent/pom.xml (original)
+++ camel/branches/camel-2.7.x/parent/pom.xml Mon Oct 10 05:58:31 2011
@@ -131,12 +131,7 @@
     <slf4j-version>1.6.1</slf4j-version>
     <smack-version>3.1.0</smack-version>
     <snmp4j-version>1.8.1_3</snmp4j-version>
-<<<<<<< HEAD
-    <smpp-version>2.1.0_1</smpp-version>
-    <spring-integration-version>2.0.3.RELEASE</spring-integration-version>
-=======
     <spring-integration-version>2.0.5.RELEASE</spring-integration-version>
->>>>>>> b8c45d1... CAMEL-4524: Upgrade jsmpp-bundle to version 2.1.0_3
     <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
     <spring-version>3.0.5.RELEASE</spring-version>
     <spring-osgi-version>1.2.0</spring-osgi-version>



Mime
View raw message