[CXF-4483] apache-cxf feature has a merge conflict

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 2.5.5
• Fix Version/s: 2.5.6
• Component/s: OSGi
• Estimated Complexity: Unknown
• Assignee: Willem Jiang
• Reporter: Willem Jiang
• Created: 22/Aug/12 13:03
• Updated: 08/Nov/12 17:14
• Resolved: 22/Aug/12 13:05

Description

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