andymc12 commented on pull request #703: URL: https://github.com/apache/cxf/pull/703#issuecomment-705000123
I ran into a merge conflict - and I think I've resolved it. I'd like to wait until Jenkins has finished this CI build before merging, but no need to re-review unless you want to check my merge-conflict-resolution. Thanks! ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
