flink-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhueske <...@git.apache.org>
Subject [GitHub] flink pull request: FLINK-3529 Add template for pull requests
Date Tue, 22 Mar 2016 08:58:51 GMT
Github user fhueske commented on a diff in the pull request:

    https://github.com/apache/flink/pull/1729#discussion_r56953234
  
    --- Diff: CONTRIBUTING.md ---
    @@ -7,5 +7,6 @@ To make the process smooth for the project *committers* (those who review
and ac
     ## Contribution Guidelines
     
     Please check out the [How to Contribute guide](http://flink.apache.org/how-to-contribute.html)
to understand how contributions are made.
    +<<<<<<< Updated upstream
    --- End diff --
    
    Looks like a left-over of a merge/rebase conflict.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message