Github user martinjaggi commented on the pull request:

    https://github.com/apache/incubator-spark/pull/566#issuecomment-34589384
  
    yes, that conflict came from the style change. i have rebased the patch 
again now

Reply via email to