Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/10704bee Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/10704bee Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/10704bee Branch: refs/heads/3.0.x-fixes Commit: 10704bee9b1c6dbdfa9e5f3338c36f23fd922e6b Parents: 4c8c0cd Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Jan 27 17:15:08 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Jan 27 17:15:08 2016 +0000 ---------------------------------------------------------------------- parent/pom.xml | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/10704bee/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 6ea5612..e581f9f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -151,11 +151,7 @@ <cxf.servlet-api.version>1.0</cxf.servlet-api.version> <cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact> <cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version> -<<<<<<< HEAD - <cxf.slf4j.version>1.7.9</cxf.slf4j.version> -======= <cxf.slf4j.version>1.7.14</cxf.slf4j.version> ->>>>>>> cc2a8d6... Updating BouncyCastle + SLF4J <cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version> <cxf.spring.version>3.2.14.RELEASE</cxf.spring.version> <cxf.spring.security.version>3.1.7.RELEASE</cxf.spring.security.version>
