cpcloud commented on a change in pull request #23: Build wheels for 0.9.0 URL: https://github.com/apache/arrow-dist/pull/23#discussion_r176430763
########## File path: cpp-linux/yum/arrow.spec.in ########## @@ -220,6 +225,13 @@ Documentation for Apache Arrow GLib. %endif %changelog +<<<<<<< HEAD +* Fri Mar 16 2018 Kouhei Sutou <[email protected]> - 0.9.0-1 +======= +* Wed Mar 21 2018 Phillip Cloud <[email protected]> - 0.9.0-1 +>>>>>>> 676eac104f23c7003a88ec51a7b5710093143c12 Review comment: Merge conflict. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
