Github user SreeramGarlapati commented on the issue:
https://github.com/apache/storm/pull/2588
@srdo - when I try to merge my changes with `master` - I ended up with a
merge conflicts due to `line endings` change. is there any simple tip - which I
can use to ease through this? like changed my files to a specific `line ending`
before the merge etc?
Thanks a lot for the help so far!---
