cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [6/6] git commit: Fixing merge
Date Wed, 06 Aug 2014 15:28:55 GMT
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46687eca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46687eca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46687eca

Branch: refs/heads/2.7.x-fixes
Commit: 46687ecacf5999fd3b909c3a00e051dbda0b597a
Parents: 41707f6
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Wed Aug 6 16:25:58 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Wed Aug 6 16:25:58 2014 +0100

----------------------------------------------------------------------
 parent/pom.xml | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/46687eca/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b612d8a..0ef6fa3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,14 +188,7 @@
         <cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
         <cxf.dom4j.bundle.version>1.6.1_5</cxf.dom4j.bundle.version>
         <cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
-<<<<<<< HEAD
         <cxf.jexl.version>2.1.1</cxf.jexl.version>
-
-=======
-        <cxf.olingo.version>1.2.0</cxf.olingo.version>
-        <cxf.tika.version>1.5</cxf.tika.version>
-        <cxf.jexl.version>2.1.1</cxf.jexl.version>
->>>>>>> 1d20b41... Removing some tabs
         <cxf.checkstyle.extension />
         <cxf.jaxb.context.class />
 


Mime
View raw message