cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [5/5] git commit: Fixing build
Date Thu, 26 Jun 2014 15:17:03 GMT
Fixing build


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

Branch: refs/heads/2.6.x-fixes
Commit: 5ef5d91a8cb181dd532c8e83b53e7f8c3f272f5a
Parents: c632ec3
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Jun 26 16:16:35 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Jun 26 16:16:35 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/ws/security/trust/Messages.properties     | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/5ef5d91a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
index 94193fb..570dacd 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
@@ -25,9 +25,6 @@ DERIVED_KEY_ERROR=Exception while trying to create secret key from RequestSecuri
 ENCRYPTED_KEY_ERROR=Exception while trying to decrypt key from RequestSecurityTokenResponse
 VALIDATION_FAILED=Validation of security token failed: {0}
 NO_USER_PASSWORD=No user name and/or password is available, name: {0}, password: {1}
-<<<<<<< HEAD
-=======
 ADDRESS_NOT_MATCHED=Cannot match the address {0} to the WSDL received via WS-MEX
 WS_MEX_ERROR=Exception when trying to retrieve/process a WSDL via WS-MEX
 NO_LOCATION=The STSClient is not configured with either a location or wsdlLocation property
->>>>>>> 0c0e20a... Avoiding NPE if either a location/wsdlLocation is
not configured on the STSClient


Mime
View raw message