[
https://issues.jenkins-ci.org/browse/JENKINS-12722?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Christian Wolfgang resolved JENKINS-12722.
------------------------------------------
Resolution: Fixed
> Merge conflict - error message
> ------------------------------
>
> Key: JENKINS-12722
> URL: https://issues.jenkins-ci.org/browse/JENKINS-12722
> Project: Jenkins
> Issue Type: Improvement
> Components: clearcase-ucm
> Reporter: Christian Wolfgang
> Assignee: Christian Wolfgang
> Priority: Minor
>
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.jenkins-ci.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
