Do not show the artifact and its pom as separate items in the conflicting
artifacts page when merging repos
------------------------------------------------------------------------------------------------------------
Key: MRM-1405
URL: http://jira.codehaus.org/browse/MRM-1405
Project: Archiva
Issue Type: Improvement
Components: Web Interface
Reporter: Maria Odea Ching
Attachments: merge-conflict.png
See attached screenshot. This affects MRM-980 branch.
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira
