Removing some tabs
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e7dc7216
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e7dc7216
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e7dc7216
Branch: refs/heads/2.7.x-fixes
Commit: e7dc7216fe855918bc8fdecd24950fe3abe29735
Parents: 3f3bd20
Author: Colm O hEigeartaigh <cohei...@apache.org>
Authored: Wed Aug 6 16:17:12 2014 +0100
Committer: Colm O hEigeartaigh <cohei...@apache.org>
Committed: Wed Aug 6 16:24:30 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 6 ++++++
services/sts/sts-core/pom.xml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e7dc7216/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0487552..b612d8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -188,8 +188,14 @@
<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 />
http://git-wip-us.apache.org/repos/asf/cxf/blob/e7dc7216/services/sts/sts-core/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml
index f48b033..41145c9 100644
--- a/services/sts/sts-core/pom.xml
+++ b/services/sts/sts-core/pom.xml
@@ -111,7 +111,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
<version>${cxf.jexl.version}</version>
- <optional>true</optional>
+ <optional>true</optional>
</dependency>
</dependencies>
