[
https://issues.apache.org/jira/browse/FLINK-3529?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15206031#comment-15206031
]
ASF GitHub Bot commented on FLINK-3529:
---------------------------------------
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.
> Add pull request template
> -------------------------
>
> Key: FLINK-3529
> URL: https://issues.apache.org/jira/browse/FLINK-3529
> Project: Flink
> Issue Type: Task
> Components: other
> Reporter: Martin Liesenberg
> Assignee: Martin Liesenberg
> Priority: Minor
>
> Add a template for pull requests, checking if prerequisites of opening a PR
> have been fulfilled.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)