cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Fixing a back merge issue in 2.7.x
Date Wed, 05 Nov 2014 13:06:46 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 9d671444d -> a446d92c2


Fixing a back merge issue in 2.7.x


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

Branch: refs/heads/2.7.x-fixes
Commit: a446d92c2456960d8adccfd404a952154101d8fd
Parents: 9d67144
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Nov 5 13:06:21 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Nov 5 13:06:21 2014 +0000

----------------------------------------------------------------------
 systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a446d92c/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
index d67c9b2..fac009e 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_proxy/WEB-INF/beans.xml
@@ -24,7 +24,7 @@
   xsi:schemaLocation="
   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
   http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"-->
-<<<<<<< HEAD
+
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:jaxrs="http://cxf.apache.org/jaxrs"


Mime
View raw message