Merge pull request #3286 from longjon/fix-py3-travis-boost
authorJon Long <jonlong@cs.berkeley.edu>
Thu, 5 Nov 2015 07:49:15 +0000 (23:49 -0800)
committerJon Long <jonlong@cs.berkeley.edu>
Thu, 5 Nov 2015 07:49:15 +0000 (23:49 -0800)
[travis] fix boost/python3 conda conflict


Trivial merge