Willem Jiang created CXF-4483:
---------------------------------
Summary: apache-cxf feature has a merge conflict
Key: CXF-4483
URL: https://issues.apache.org/jira/browse/CXF-4483
Project: CXF
Issue Type: Bug
Components: OSGi
Affects Versions: 2.5.5
Reporter: Willem Jiang
Assignee: Willem Jiang
Fix For: 2.5.6
There is merge conflict which is introduced by a cherry-pick method ago in the
apache-cxf features.xml.
Merged revisions 1363941 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
