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)
commita53fe0f484c40c4915bcef324efd462f96eef241
tree032dbcba761f0b89d0e3bba882868d852479c213
parentebd7bd76f8eb4d78378289987b33e360ecf7f905
parent5196926a7cca1a85aecbd97e78452352fc5d2b3d
Merge pull request #3286 from longjon/fix-py3-travis-boost

[travis] fix boost/python3 conda conflict