You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@helix.apache.org by "Kanak Biscuitwala (JIRA)" <ji...@apache.org> on 2013/12/03 00:06:35 UTC

[jira] [Resolved] (HELIX-320) Some files have unresolved conflicts in comments

     [ https://issues.apache.org/jira/browse/HELIX-320?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Kanak Biscuitwala resolved HELIX-320.
-------------------------------------

    Resolution: Fixed

Fixed. Review: https://reviews.apache.org/r/15726/

> Some files have unresolved conflicts in comments
> ------------------------------------------------
>
>                 Key: HELIX-320
>                 URL: https://issues.apache.org/jira/browse/HELIX-320
>             Project: Apache Helix
>          Issue Type: Bug
>            Reporter: Kanak Biscuitwala
>            Assignee: Kanak Biscuitwala
>




--
This message was sent by Atlassian JIRA
(v6.1#6144)