fixed merge conflict in .travis file
dev
1 parent b472d76 commit 8807df44d7e398c1bb72089ccab47d1bf6b78274
@Brian Riley Brian Riley authored on 12 Aug 2016
Showing 1 changed file
View
.travis.yml