Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b2dc4d4d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b2dc4d4d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b2dc4d4d Branch: refs/heads/3.0.x-fixes Commit: b2dc4d4dd8320c302eea078a1908f4202543f5d8 Parents: b1a0e4e Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Mar 6 18:51:07 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Mar 6 18:51:07 2015 +0000 ---------------------------------------------------------------------- systests/kerberos/src/test/resources/ldap.properties | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b2dc4d4d/systests/kerberos/src/test/resources/ldap.properties ---------------------------------------------------------------------- diff --git a/systests/kerberos/src/test/resources/ldap.properties b/systests/kerberos/src/test/resources/ldap.properties index c4ea789..4bf29cd 100644 --- a/systests/kerberos/src/test/resources/ldap.properties +++ b/systests/kerberos/src/test/resources/ldap.properties @@ -17,10 +17,6 @@ # under the License. # -<<<<<<< HEAD -claimUser=alice -======= claimUser=alice otherClaimUser=bob binaryClaimUser=dave ->>>>>>> 5903132... [CXF-6283] - Support binary attributes in the LDAPClaimsHandler
