[GitHub] incubator-eagle pull request #526: [MINOR] Fix end of line conflict caused b...

[haoch]

Github user haoch closed the pull request at:

https://github.com/apache/incubator-eagle/pull/526


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-eagle pull request #526: [MINOR] Fix end of line conflict caused b...

[haoch]

GitHub user haoch opened a pull request:

https://github.com/apache/incubator-eagle/pull/526

[MINOR] Fix end of line conflict caused by .gitattributes



Be sure to do all of the following to help us incorporate your contribution
quickly and easily:

 - [ ] Make sure the PR title is formatted like:
   `[EAGLE-] Description of pull request`
 - [ ] Make sure tests pass via `mvn clean verify`. (Even better, enable
   Travis-CI on your fork and ensure the whole test matrix passes).
 - [ ] Replace `` in the title with the actual Jira issue
   number, if there is one.
 - [ ] If this contribution is large, please file an Apache
   [Individual Contributor License 
Agreement](https://www.apache.org/licenses/icla.txt).

---

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/haoch/incubator-eagle FixEOL

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-eagle/pull/526.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #526


commit 2479d32791dd1a424af7513279ba28543baf6af4
Author: wujinhu 
Date:   2016-10-18T09:20:37Z

[EAGLE-633] MR history feeder read some configurations from eagle server

Author: wujinhu 

Closes #525 from wujinhu/EAGLE-633.

commit a4cd8248f11226538fad217d265ac1a0b5bd8190
Author: Hao Chen 
Date:   2016-10-18T09:46:44Z

[MINOR] Fix CRLF to LF as default eol

commit b8d41cdc2cc8ee8e601ab3147d2339fe6e70dade
Author: Hao Chen 
Date:   2016-10-18T09:50:49Z

Merge 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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---